diff --git a/images/nvim.png b/images/nvim.png
deleted file mode 100644
index ca330f6..0000000
Binary files a/images/nvim.png and /dev/null differ
diff --git a/lua/core/keymaps.lua b/lua/core/keymaps.lua
index 7a73631..c966c0c 100644
--- a/lua/core/keymaps.lua
+++ b/lua/core/keymaps.lua
@@ -37,6 +37,7 @@ map("n", "<C-y>", "<cmd>%y+<CR>", {
     desc = "Copy whole file"
 })
 
+
 -- Paste
 map("n", "]p", "o<Esc>p", {
     desc = "Paste below"
@@ -54,9 +55,10 @@ map({
     desc = "Copy to clipboard"
 })
 
--- Use jj as escape
-map('i', 'jj', '<Esc>', opts)
-map('t', 'JJ', '<C-\\><C-n>', opts)
+-- Better escape using jk in insert and terminal mode
+map("i", "jk", "<ESC>")
+map("i", "kj", "<ESC>")
+map("i", "jj", "<ESC>")
 
 -- Visual overwrite paste
 map({ 'v', 'x' }, 'p', '"_dP', opts)
@@ -80,12 +82,18 @@ map('n', 'n', 'nzzzv', opts)
 map('n', 'N', 'Nzzzv', opts)
 
 -- Better up/down
-map('n', 'j', "v:count == 0 ? 'gj' : 'j'", { expr = true, silent = true })
-map('n', 'k', "v:count == 0 ? 'gk' : 'k'", { expr = true, silent = true })
+vim.keymap.set({ "n", "x" }, "j", "v:count == 0 ? 'gj' : 'j'", { expr = true, silent = true })
+vim.keymap.set({ "n", "x" }, "<Down>", "v:count == 0 ? 'gj' : 'j'", { expr = true, silent = true })
+vim.keymap.set({ "n", "x" }, "k", "v:count == 0 ? 'gk' : 'k'", { expr = true, silent = true })
+vim.keymap.set({ "n", "x" }, "<Up>", "v:count == 0 ? 'gk' : 'k'", { expr = true, silent = true })
 
 -- Move text up and down
-map({ 'v', 'x' }, 'J', ":move '>+1<CR>gv-gv", opts)
-map({ 'v', 'x' }, 'K', ":move '<-2<CR>gv-gv", opts)
+vim.keymap.set("n", "<A-j>", "<cmd>m .+1<cr>==", { desc = "Move Down" })
+vim.keymap.set("n", "<A-k>", "<cmd>m .-2<cr>==", { desc = "Move Up" })
+vim.keymap.set("i", "<A-j>", "<esc><cmd>m .+1<cr>==gi", { desc = "Move Down" })
+vim.keymap.set("i", "<A-k>", "<esc><cmd>m .-2<cr>==gi", { desc = "Move Up" })
+vim.keymap.set("v", "<A-j>", ":m '>+1<cr>gv=gv", { desc = "Move Down" })
+vim.keymap.set("v", "<A-k>", ":m '<-4<cr>gv=gv", { desc = "Move Up" })
 
 -- Clear search, diff update and redraw
 map({ 'i', 'n' }, '<esc>', '<cmd>noh<cr><esc>', { desc = 'Escape and clear hlsearch' })
@@ -107,6 +115,69 @@ map('i', ',', ',<c-g>u')
 map('i', '.', '.<c-g>u')
 map('i', ';', ';<c-g>u')
 
+
+-- Search
+map({
+    "n",
+    "x"
+}, "gw", "*N", {
+    desc = "Search word under cursor"
+})
+
+
+-- Insert empty line in insert mode
+map("i", "<A-o>", "<C-O>o", {
+    desc = "Insert empty line below"
+})
+map("i", "<A-O>", "<C-O>O", {
+    desc = "Insert empty line above"
+})
+
+-- Insert empty line without entering insert mode
+map('n', '[o', ':<C-u>call append(line("."), repeat([""], v:count1))<CR>', {
+    desc = "Insert empty line below"
+})
+map('n', ']o', ':<C-u>call append(line(".")-1, repeat([""], v:count1))<CR>', {
+    desc = "Insert empty line above"
+})
+
+-- go to beginning and end in insert mode
+map("i", "<A-b>", "<ESC>^i", {
+    desc = "Go to beginning of line"
+})
+map("i", "<A-e>", "<End>", {
+    desc = "Go to end of line"
+})
+
+-- navigate within insert mode
+map("i", "<C-h>", "<Left>", {
+    desc = "Move Left"
+})
+map("i", "<C-l>", "<Right>", {
+    desc = "Move Right"
+})
+map("i", "<C-j>", "<Down>", {
+    desc = "Move Down"
+})
+map("i", "<C-k>", "<Up>", {
+    desc = "Move Up"
+})
+
+
+-- Move to window using the <ctrl> hjkl keys
+vim.keymap.set("n", "<C-h>", "<C-w>h", { desc = "Go to Left Window", remap = true })
+vim.keymap.set("n", "<C-j>", "<C-w>j", { desc = "Go to Lower Window", remap = true })
+vim.keymap.set("n", "<C-k>", "<C-w>k", { desc = "Go to Upper Window", remap = true })
+vim.keymap.set("n", "<C-l>", "<C-w>l", { desc = "Go to Right Window", remap = true })
+
+
+-- Resize window using <ctrl> arrow keys
+vim.keymap.set("n", "<C-Up>", "<cmd>resize +2<cr>", { desc = "Increase Window Height" })
+vim.keymap.set("n", "<C-Down>", "<cmd>resize -2<cr>", { desc = "Decrease Window Height" })
+vim.keymap.set("n", "<C-Left>", "<cmd>vertical resize -2<cr>", { desc = "Decrease Window Width" })
+vim.keymap.set("n", "<C-Right>", "<cmd>vertical resize +2<cr>", { desc = "Increase Window Width" })
+
+
 -- Codeium
 map('i', '<M-;>', function () return vim.fn['codeium#Accept']() end, { expr = true, silent = true })
 map('i', '<M-]>', function() return vim.fn['codeium#CycleCompletions'](1) end, { expr = true, silent = true })
@@ -119,3 +190,9 @@ map('n', '<leader>e', function()
 	require("oil").toggle_float()
 end, { desc = icons.documents.OpenFolder .. 'Oil File Explorer' })
 
+
+map('n', '<leader>mu', function()
+          require("notify").dismiss({ silent = true, pending = true })
+        end, { desc = 'Dismiss All Notifications' })
+
+
diff --git a/lua/plugins/lang/cmp.lua b/lua/plugins/lang/cmp.lua
index 57ad0cb..dd1df7f 100644
--- a/lua/plugins/lang/cmp.lua
+++ b/lua/plugins/lang/cmp.lua
@@ -121,6 +121,7 @@ cmp.setup({
             vim_item.menu = ({
                 codeium = '[Codeium]',
                 nvim_lsp = '[LSP]',
+                nvim_lua = '[nvim_lua]',
                 luasnip = '[Snippet]',
                 buffer = '[Buffer]',
                 path = '[Path]',
@@ -142,14 +143,14 @@ cmp.setup({
     },
     window = {
         documentation = {
-            border = false,
-            --winhighlight = 'NormalFloat:Pmenu,NormalFloat:Pmenu,CursorLine:PmenuSel,Search:None',
+            border = 'rounded',
+            winhighlight = 'NormalFloat:Pmenu,NormalFloat:Pmenu,CursorLine:PmenuSel,Search:None',
+            max_height = 15,
             scrollbar = false,
         },
         completion = {
-            border = false,
-            --winhighlight = 'NormalFloat:Pmenu,NormalFloat:Pmenu,CursorLine:PmenuSel,Search:None',
-            max_height = 15,
+            border = 'rounded',
+            winhighlight = 'NormalFloat:Pmenu,NormalFloat:Pmenu,CursorLine:PmenuSel,Search:None',
             scrollbar = false,
         },
     },
diff --git a/lua/plugins/list.lua b/lua/plugins/list.lua
index 927f62f..ff2ad90 100644
--- a/lua/plugins/list.lua
+++ b/lua/plugins/list.lua
@@ -41,6 +41,10 @@ local plugins = {
     },
     {
         'nvimdev/dashboard-nvim',
+        dependencies = {
+            "rubiin/fortune.nvim",
+             config = true,
+        },
         config = load_config('ui.dashboard'),
         -- Only load when no arguments
         event = function()
@@ -195,6 +199,7 @@ local plugins = {
             'hrsh7th/cmp-path',
             'hrsh7th/cmp-cmdline',
             'hrsh7th/cmp-nvim-lua',
+            'hrsh7th/cmp-nvim-lsp',
             'L3MON4D3/LuaSnip',
             'rafamadriz/friendly-snippets',
             'saadparwaiz1/cmp_luasnip',
@@ -213,6 +218,14 @@ local plugins = {
         },
     },
     -- Tools
+    {
+        'akinsho/flutter-tools.nvim',
+        dependencies = {
+            'nvim-lua/plenary.nvim',
+            'stevearc/dressing.nvim',
+        },
+        config = load_config('tools.flutter-tools'),
+    },
     {
         'nvim-tree/nvim-tree.lua',
         dependencies = {
diff --git a/lua/plugins/lock.json b/lua/plugins/lock.json
index 0d18830..02188be 100644
--- a/lua/plugins/lock.json
+++ b/lua/plugins/lock.json
@@ -1,11 +1,11 @@
 {
-  "LuaSnip": { "branch": "master", "commit": "7b1dda0dfdefc10b2501295eba5e463dbd7c338f" },
+  "LuaSnip": { "branch": "master", "commit": "de1a287c9cb525ae52bc846e8f6207e5ef1da5ac" },
   "Navigator.nvim": { "branch": "master", "commit": "91d86506ac2a039504d5205d32a1d4bc7aa57072" },
   "auto-save.nvim": { "branch": "main", "commit": "5fe9ab0c42f0457f2a973e814a6352b8eeb04730" },
   "ccc.nvim": { "branch": "main", "commit": "f388f1981d222967c741fe9927edf9ba5fa3bcbe" },
   "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" },
   "cmp-cmdline": { "branch": "main", "commit": "d250c63aa13ead745e3a40f61fdd3470efde3923" },
-  "cmp-nvim-lsp": { "branch": "main", "commit": "5af77f54de1b16c34b23cba810150689a3a90312" },
+  "cmp-nvim-lsp": { "branch": "main", "commit": "39e2eda76828d88b773cc27a3f61d2ad782c922d" },
   "cmp-nvim-lua": { "branch": "main", "commit": "f12408bdb54c39c23e67cab726264c10db33ada8" },
   "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" },
   "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" },
@@ -13,22 +13,24 @@
   "code_runner.nvim": { "branch": "main", "commit": "d135c4178bf8980ca5fa4aa6e27ab9ee4373c875" },
   "codeium.vim": { "branch": "main", "commit": "9406f13cf3eaa08318b76746bd105a04506cab27" },
   "compiler.nvim": { "branch": "main", "commit": "cb14acd32ba9ea09d01bbe3493aefdc59b68965c" },
-  "dashboard-nvim": { "branch": "master", "commit": "a0a78099658c7d4be3714f657b18ca8285d5d106" },
-  "dressing.nvim": { "branch": "master", "commit": "5162edb1442a729a885c45455a07e9a89058be2f" },
-  "flash.nvim": { "branch": "main", "commit": "e84c83ad209cc2ddcacdec36ae9c63f6fff425b8" },
-  "friendly-snippets": { "branch": "main", "commit": "3e9a3f5a0cfcef1741e352c37bda4e82e5eb846a" },
+  "dashboard-nvim": { "branch": "master", "commit": "5182c09ac8085dc73b78ad0ea9f5479c9a866fc4" },
+  "dressing.nvim": { "branch": "master", "commit": "572314728cb1ce012e825fd66331f52c94acac12" },
+  "flash.nvim": { "branch": "main", "commit": "11a2e667d19d8f48c93c6ed2e2e525ac6b1b79be" },
+  "flutter-tools.nvim": { "branch": "main", "commit": "990a1349c29f7d474a0cd51355aba773ccc9deea" },
+  "fortune.nvim": { "branch": "master", "commit": "12644a2939e5db8144f3fcbc77ce6adc684ed565" },
+  "friendly-snippets": { "branch": "main", "commit": "dd2fd1281d4b22e7b4a5bfafa3e142d958e251f2" },
   "gitlinker.nvim": { "branch": "master", "commit": "cc59f732f3d043b626c8702cb725c82e54d35c25" },
   "gitsigns.nvim": { "branch": "main", "commit": "805610a9393fa231f2c2b49cb521bfa413fadb3d" },
   "hardtime.nvim": { "branch": "main", "commit": "eaf4bc31b86419c26ad7b3a142dd36ca545ca2e4" },
   "harpoon": { "branch": "harpoon2", "commit": "0378a6c428a0bed6a2781d459d7943843f374bce" },
-  "indent-blankline.nvim": { "branch": "master", "commit": "3d08501caef2329aba5121b753e903904088f7e6" },
-  "lazy.nvim": { "branch": "main", "commit": "e44636a43376e8a1e851958f7e9cbe996751d59f" },
+  "indent-blankline.nvim": { "branch": "master", "commit": "ece00d5fb44d196680a81fd2761062d2fa44663b" },
+  "lazy.nvim": { "branch": "main", "commit": "0de782a6b0ffba599dbd332a4019d852564bf28c" },
   "live-server.nvim": { "branch": "main", "commit": "f6f00a3f541251f0320910bb0d03c4ae14ee6d10" },
   "lsp_lines.nvim": { "branch": "main", "commit": "dbfd8e96ec2696e1ceedcd23fd70e842256e3dea" },
-  "lspsaga.nvim": { "branch": "main", "commit": "249f44f0746f27dcf252919d1c11e9d45075e4ca" },
+  "lspsaga.nvim": { "branch": "main", "commit": "ad61778283f26a9fa2c5a8d2f0aca52ba49f32f3" },
   "lualine.nvim": { "branch": "master", "commit": "0a5a66803c7407767b799067986b4dc3036e1983" },
   "markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" },
-  "mason-lspconfig.nvim": { "branch": "main", "commit": "9ae570e206360e47d30b4c35a4550c165f4ea7b7" },
+  "mason-lspconfig.nvim": { "branch": "main", "commit": "a4caa0d083aab56f6cd5acf2d42331b74614a585" },
   "mason-null-ls.nvim": { "branch": "main", "commit": "de19726de7260c68d94691afb057fa73d3cc53e7" },
   "mason.nvim": { "branch": "main", "commit": "49ff59aded1047a773670651cfa40e76e63c6377" },
   "mini.ai": { "branch": "main", "commit": "ee9446a17c160aba6a04ff22097389c41872c878" },
@@ -37,48 +39,48 @@
   "neodev.nvim": { "branch": "main", "commit": "ce9a2e8eaba5649b553529c5498acb43a6c317cd" },
   "neotest": { "branch": "master", "commit": "5caac5cc235d495a2382bc2980630ef36ac87032" },
   "neotest-jest": { "branch": "main", "commit": "514fd4eae7da15fd409133086bb8e029b65ac43f" },
-  "neotest-rspec": { "branch": "main", "commit": "201f4891b5a0edc2e5f12196f35726f4d4eca410" },
-  "nerdy.nvim": { "branch": "main", "commit": "1ad36242f40a8fd95ae5711258540a07a5dabb51" },
-  "noice.nvim": { "branch": "main", "commit": "09102ca2e9a3e9302119fdaf7a059a034e4a626d" },
-  "none-ls.nvim": { "branch": "main", "commit": "10c976d633862b9fe16171f5f5f17732bc54e19f" },
-  "nui.nvim": { "branch": "main", "commit": "a3597dc88b53489d3fddbddbbd13787355253bb0" },
-  "nvim-autopairs": { "branch": "master", "commit": "14e97371b2aab6ee70054c1070a123dfaa3e217e" },
-  "nvim-cmp": { "branch": "main", "commit": "24122371810089d390847d8ba66325c1f1aa64c0" },
-  "nvim-dap": { "branch": "master", "commit": "615a1b2046e1eaf7995e0ba8e8a65f344201349d" },
+  "neotest-rspec": { "branch": "main", "commit": "48573d5882cbe8d8bcd3b735d9ee7705168b1b87" },
+  "nerdy.nvim": { "branch": "main", "commit": "7d256222fda0031feae405f14d7a9414c7b6529f" },
+  "noice.nvim": { "branch": "main", "commit": "9f6f6ba74f8bfbf7e43d6302cf86b070362f6203" },
+  "none-ls.nvim": { "branch": "main", "commit": "37671797d6e5f9bd0ee3ab965ab2e6de251e1930" },
+  "nui.nvim": { "branch": "main", "commit": "b1b3dcd6ed8f355c78bad3d395ff645be5f8b6ae" },
+  "nvim-autopairs": { "branch": "master", "commit": "c15de7e7981f1111642e7e53799e1211d4606cb9" },
+  "nvim-cmp": { "branch": "main", "commit": "5260e5e8ecadaf13e6b82cf867a909f54e15fd07" },
+  "nvim-dap": { "branch": "master", "commit": "5a2f7121869394502521c52b2bc581ab22c69447" },
   "nvim-dap-ui": { "branch": "master", "commit": "5934302d63d1ede12c0b22b6f23518bb183fc972" },
-  "nvim-lspconfig": { "branch": "master", "commit": "a27179f56c6f98a4cdcc79ee2971b514815a4940" },
+  "nvim-lspconfig": { "branch": "master", "commit": "9bda20fb967075355f253911bc066a8b5a03c77e" },
   "nvim-nio": { "branch": "master", "commit": "8765cbc4d0c629c8158a5341e1b4305fd93c3a90" },
-  "nvim-notify": { "branch": "master", "commit": "5371f4bfc1f6d3adf4fe9d62cd3a9d44356bfd15" },
-  "nvim-spectre": { "branch": "master", "commit": "4651801ba37a9407b7257287aec45b6653ffc5e9" },
-  "nvim-spider": { "branch": "main", "commit": "76819082ef964db1f67f92454e18ad28ae34b37b" },
+  "nvim-notify": { "branch": "master", "commit": "d333b6f167900f6d9d42a59005d82919830626bf" },
+  "nvim-spectre": { "branch": "master", "commit": "50e96602153f14c913e1969aaf9720e080394eb3" },
+  "nvim-spider": { "branch": "main", "commit": "b2f2af0563bb631864cab262d483118f3610e662" },
   "nvim-tree.lua": { "branch": "master", "commit": "2bc725a3ebc23f0172fb0ab4d1134b81bcc13812" },
-  "nvim-treesitter": { "branch": "master", "commit": "f224fef9d28e1fd30ccd9a9c374ced2546dde6ea" },
+  "nvim-treesitter": { "branch": "master", "commit": "7c9c5bed8340031f8a6dad47a58a26eaf15b9a56" },
   "nvim-treesitter-endwise": { "branch": "master", "commit": "8b34305ffc28bd75a22f5a0a9928ee726a85c9a6" },
   "nvim-treesitter-refactor": { "branch": "master", "commit": "65ad2eca822dfaec2a3603119ec3cc8826a7859e" },
-  "nvim-treesitter-textobjects": { "branch": "master", "commit": "dfa4178c0cadb44f687603d72ad0908474c28dd9" },
+  "nvim-treesitter-textobjects": { "branch": "master", "commit": "5f9bf4b1ead7707e4e74e5319ee56bdc81fb73db" },
   "nvim-treesitter-textsubjects": { "branch": "master", "commit": "1428108f18ce9d8cc4481dcedebeeb490eabf395" },
-  "nvim-ts-autotag": { "branch": "main", "commit": "531f48334c422222aebc888fd36e7d109cb354cd" },
-  "nvim-ts-context-commentstring": { "branch": "main", "commit": "0bdccb9c67a42a5e2d99384dc9bfa29b1451528f" },
+  "nvim-ts-autotag": { "branch": "main", "commit": "cb57b07803476ee902c89412aeff219a9a58be13" },
+  "nvim-ts-context-commentstring": { "branch": "main", "commit": "cbab9ad88036915beebd13b47e100743ff2ed2d5" },
   "nvim-web-devicons": { "branch": "master", "commit": "e37bb1feee9e7320c76050a55443fa843b4b6f83" },
-  "oil.nvim": { "branch": "master", "commit": "3283deec96314326faed1d3a94ce142ae9773d8b" },
+  "oil.nvim": { "branch": "master", "commit": "06a19f77f1a1da37b675635e6f9c5b5d50bcaacd" },
   "onedark.nvim": { "branch": "master", "commit": "8e4b79b0e6495ddf29552178eceba1e147e6cecf" },
-  "overseer.nvim": { "branch": "master", "commit": "226789848772d99b3b61363b6ea7663882f8c05e" },
-  "plenary.nvim": { "branch": "master", "commit": "08e301982b9a057110ede7a735dd1b5285eb341f" },
+  "overseer.nvim": { "branch": "master", "commit": "7a9b654df4b3b246d05fff857f32e9fb8ddfb013" },
+  "plenary.nvim": { "branch": "master", "commit": "b5c8de02a44ffeabff678090edd6a132ff8ab77d" },
   "rainbow-delimiters.nvim": { "branch": "master", "commit": "dd1156723eb8483e4403eb8765bbdff456b6981d" },
   "refactoring.nvim": { "branch": "master", "commit": "d2786877c91aa409c824f27b4ce8a9f560dda60a" },
   "sniprun": { "branch": "master", "commit": "9006d4af4f7016523f8619ae1526ab4e7f0df785" },
-  "tabout.nvim": { "branch": "master", "commit": "26cf934f872e2fbfab55d572c5eb7dad0e82238e" },
+  "tabout.nvim": { "branch": "master", "commit": "3d7fbc7f5e91ef0f96b4d787c78ad9f8820de3ec" },
   "tdo.nvim": { "branch": "main", "commit": "95d4651bc5aef366b7d53a0ba6872cf444c09f33" },
   "telescope-file-browser.nvim": { "branch": "master", "commit": "4d5fd21bae12ee6e9a79232e1c377f43c419d0c5" },
   "telescope-fzf-native.nvim": { "branch": "main", "commit": "9ef21b2e6bb6ebeaf349a0781745549bbb870d27" },
   "telescope-menufacture": { "branch": "main", "commit": "79376f887f589a4240267383e8abc0a31861325a" },
   "telescope-symbols.nvim": { "branch": "master", "commit": "a6d0127a53d39b9fc2af75bd169d288166118aec" },
   "telescope-undo.nvim": { "branch": "main", "commit": "95b61c01ea3a4c9e8747731148e905bbcf0ccaee" },
-  "telescope.nvim": { "branch": "master", "commit": "e9be6bb7a78cd44b9183ede4627d2bfea4f301f0" },
-  "termim.nvim": { "branch": "main", "commit": "2dba526e99c32a65db9599cfa90e85db13724a44" },
+  "telescope.nvim": { "branch": "master", "commit": "0c12735d5aff6a48ffd8111bf144dc2ff44e5975" },
+  "termim.nvim": { "branch": "main", "commit": "1f88c66449c832445399c414fc4313dba5174b1b" },
   "ts-node-action": { "branch": "master", "commit": "6d3b60754fd87963d70eadaa2f77873b447eac26" },
   "twilight.nvim": { "branch": "main", "commit": "8b7b50c0cb2dc781b2f4262a5ddd57571556d1e4" },
-  "vim-fugitive": { "branch": "master", "commit": "ce882460cf3db12e99f8bf579cbf99e331f6dd4f" },
+  "vim-fugitive": { "branch": "master", "commit": "4f59455d2388e113bd510e85b310d15b9228ca0d" },
   "which-key.nvim": { "branch": "main", "commit": "4433e5ec9a507e5097571ed55c02ea9658fb268a" },
   "zen-mode.nvim": { "branch": "main", "commit": "78557d972b4bfbb7488e17b5703d25164ae64e6a" }
 }
\ No newline at end of file
diff --git a/lua/plugins/tools/code-runner.lua b/lua/plugins/tools/code-runner.lua
index a2ef7f1..4ad77c2 100644
--- a/lua/plugins/tools/code-runner.lua
+++ b/lua/plugins/tools/code-runner.lua
@@ -5,6 +5,7 @@ require('code_runner').setup({
       "javac $fileName &&",
       "java $fileNameWithoutExt"
     },
+    dart = "cd $path && dart $fn",
     python = "python3 -u",
     typescript = "deno run",
     rust = {
diff --git a/lua/plugins/tools/flutter-tools.lua b/lua/plugins/tools/flutter-tools.lua
new file mode 100644
index 0000000..484fa63
--- /dev/null
+++ b/lua/plugins/tools/flutter-tools.lua
@@ -0,0 +1 @@
+require("flutter-tools").setup {} -- use defaults
diff --git a/lua/plugins/tools/harpoon.lua b/lua/plugins/tools/harpoon.lua
index 218a415..975465e 100644
--- a/lua/plugins/tools/harpoon.lua
+++ b/lua/plugins/tools/harpoon.lua
@@ -29,7 +29,10 @@ end, { desc = 'Telescope Marks' })
 vim.keymap.set('n', '<leader>hm', function()
     harpoon.ui:toggle_quick_menu(harpoon:list())
 end, { desc = 'Open UI' })
-
+vim.keymap.set('n', '<leader>hd', function()
+    harpoon:list():remove(selected_entry)
+end, { desc = 'Delete Mark' }
+)
 vim.keymap.set('n', '[h', function()
     harpoon:list():prev()
 end, { desc = 'Prev Mark' })
diff --git a/lua/plugins/tools/telescope.lua b/lua/plugins/tools/telescope.lua
index 19753c3..5919f8e 100644
--- a/lua/plugins/tools/telescope.lua
+++ b/lua/plugins/tools/telescope.lua
@@ -166,3 +166,4 @@ require('telescope').load_extension('notify')
 require('telescope').load_extension('noice')
 require('telescope').load_extension('refactoring')
 require('telescope').load_extension('file_browser')
+require('telescope').load_extension('flutter')
diff --git a/lua/plugins/tools/which-key.lua b/lua/plugins/tools/which-key.lua
index df1d513..dce1731 100644
--- a/lua/plugins/tools/which-key.lua
+++ b/lua/plugins/tools/which-key.lua
@@ -149,6 +149,15 @@ local mappings = {
         t = { '<cmd>DapUIToggle<cr>', 'Debugger' },
         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"},
+    },
     d = {
         name = icons.ui.Database .. 'Database',
         b = { '<cmd>DBToggle<cr>', 'DB Explorer' },
@@ -182,8 +191,8 @@ local mappings = {
         n = { '<cmd>enew<cr>', 'New File' },
         r = { '<cmd>Telescope oldfiles<cr>', 'Recent Files' },
         p = { '<cmd>Telescope<cr>', 'Panel' },
-        q = { '<cmd>Telescope quickfix<cr>', 'Quickfix' },
         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' },
         u = { '<cmd>Telescope undo<cr>', 'Undo History' },
         U = { '<cmd>Telescope colorscheme<cr>', 'Colorscheme' },
         ['"'] = { '<cmd>Telescope registers<cr>', 'Registers' },
diff --git a/lua/plugins/ui/dashboard.lua b/lua/plugins/ui/dashboard.lua
index 228d274..caf5b6c 100644
--- a/lua/plugins/ui/dashboard.lua
+++ b/lua/plugins/ui/dashboard.lua
@@ -66,7 +66,12 @@ dashboard.setup({
                 key = 'q',
             },
         },
-        footer = { '', icons.ui.Heart .. ' Happiness is a state of mind. ' .. icons.ui.Heart },
+        footer = function()
+            local info = {}
+            local fortune = require("fortune").get_fortune()
+            local footer = vim.list_extend(info, fortune)
+            return footer
+        end,
     },
 })
 
diff --git a/lua/plugins/ui/onedark.lua b/lua/plugins/ui/onedark.lua
index fb3b13d..6534f1f 100644
--- a/lua/plugins/ui/onedark.lua
+++ b/lua/plugins/ui/onedark.lua
@@ -1,7 +1,7 @@
 local onedark = require('onedark')
 
 onedark.setup({
-    style = 'deep',
+    style = 'darker',
     transparent = true,
     term_colors = false,
     ending_tildes = false,