diff --git a/lazy-lock.json b/lazy-lock.json
index 4cebdce..7fbffc2 100644
--- a/lazy-lock.json
+++ b/lazy-lock.json
@@ -1,4 +1,5 @@
 {
+  "Comment.nvim": { "branch": "master", "commit": "e30b7f2008e52442154b66f7c519bfd2f1e32acb" },
   "LuaSnip": { "branch": "master", "commit": "03c8e67eb7293c404845b3982db895d59c0d1538" },
   "catppuccin": { "branch": "main", "commit": "63685e1562ef53873c9764b483d7ac5c7a608922" },
   "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" },
@@ -7,7 +8,7 @@
   "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" },
   "conform.nvim": { "branch": "master", "commit": "797de8f79055334104cf77893cd93fe3fc2ac154" },
   "edgy.nvim": { "branch": "main", "commit": "0e8bbab4eba9dab6c237e4a2e146dc0466897be6" },
-  "fidget.nvim": { "branch": "main", "commit": "d855eed8a06531a7e8fd0684889b2943f373c469" },
+  "git-worktree.nvim": { "branch": "master", "commit": "f247308e68dab9f1133759b05d944569ad054546" },
   "gitsigns.nvim": { "branch": "main", "commit": "356df59308d8b87486644d2324d7558ac0f3db36" },
   "harpoon": { "branch": "harpoon2", "commit": "0378a6c428a0bed6a2781d459d7943843f374bce" },
   "lazy.nvim": { "branch": "main", "commit": "a09c876f6ef642c8feaea45932df73b058d9a083" },
@@ -16,6 +17,7 @@
   "mason.nvim": { "branch": "main", "commit": "e2f7f9044ec30067bc11800a9e266664b88cda22" },
   "neo-tree.nvim": { "branch": "v3.x", "commit": "a77af2e764c5ed4038d27d1c463fa49cd4794e07" },
   "neoconf.nvim": { "branch": "main", "commit": "944f30e58171cf909b6567ce206e9097745560d1" },
+  "noice.nvim": { "branch": "main", "commit": "c1ba80ccf6b3bd8c7fc88fe2e61085131d44ad65" },
   "nui.nvim": { "branch": "main", "commit": "b58e2bfda5cea347c9d58b7f11cf3012c7b3953f" },
   "nvim-cmp": { "branch": "main", "commit": "d818fd0624205b34e14888358037fb6f5dc51234" },
   "nvim-dap": { "branch": "master", "commit": "bc03b83c94d0375145ff5ac6a6dcf28c1241e06f" },
@@ -24,6 +26,7 @@
   "nvim-jdtls": { "branch": "master", "commit": "6bfd1591583b02e742fc3a2f43393c4ea3b6d3c7" },
   "nvim-lspconfig": { "branch": "master", "commit": "1ea7c6126a1aa0121098e4f16c04d5dde1a4ba22" },
   "nvim-nio": { "branch": "master", "commit": "a428f309119086dc78dd4b19306d2d67be884eee" },
+  "nvim-notify": { "branch": "master", "commit": "fbef5d32be8466dd76544a257d3f3dce20082a07" },
   "nvim-treesitter": { "branch": "master", "commit": "733fa85db27079ec2757183c5c840ba15a303e1f" },
   "nvim-web-devicons": { "branch": "master", "commit": "e612de3d3a41a6b7be47f51e956dddabcbf419d9" },
   "oil.nvim": { "branch": "master", "commit": "9e5eb2fcd1dfee2ff30c89273ffff179e42034b9" },
@@ -33,8 +36,13 @@
   "telescope.nvim": { "branch": "master", "commit": "79552ef8488cb492e0f9d2bf3b4e808f57515e35" },
   "todo-comments.nvim": { "branch": "main", "commit": "ae0a2afb47cf7395dc400e5dc4e05274bf4fb9e0" },
   "trouble.nvim": { "branch": "main", "commit": "40c5317a6e90fe3393f07b0fee580d9e93a216b4" },
+  "twilight.nvim": { "branch": "main", "commit": "1584c0b0a979b71fd86b18d302ba84e9aba85b1b" },
   "undotree": { "branch": "master", "commit": "56c684a805fe948936cda0d1b19505b84ad7e065" },
   "vim-be-good": { "branch": "master", "commit": "4fa57b7957715c91326fcead58c1fa898b9b3625" },
+  "vim-dadbod": { "branch": "master", "commit": "7888cb7164d69783d3dce4e0283decd26b82538b" },
+  "vim-dadbod-completion": { "branch": "master", "commit": "880f7e9f2959e567c718d52550f9fae1aa07aa81" },
+  "vim-dadbod-ui": { "branch": "master", "commit": "f29c85ab42861c6ef683289b0c6a51e0d436dcf6" },
   "vim-fugitive": { "branch": "master", "commit": "0444df68cd1cdabc7453d6bd84099458327e5513" },
-  "which-key.nvim": { "branch": "main", "commit": "fb070344402cfc662299d9914f5546d840a22126" }
+  "which-key.nvim": { "branch": "main", "commit": "fb070344402cfc662299d9914f5546d840a22126" },
+  "zen-mode.nvim": { "branch": "main", "commit": "29b292bdc58b76a6c8f294c961a8bf92c5a6ebd6" }
 }
diff --git a/lua/barink/init.lua b/lua/barink/init.lua
index ac71066..86db5db 100644
--- a/lua/barink/init.lua
+++ b/lua/barink/init.lua
@@ -1,6 +1,5 @@
 require("barink.vim")
 require("barink.keys")
-
 local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim"
 if not vim.loop.fs_stat(lazypath) then
     vim.fn.system({
diff --git a/lua/barink/plugins/comments.lua b/lua/barink/plugins/comments.lua
new file mode 100644
index 0000000..ed2b9c0
--- /dev/null
+++ b/lua/barink/plugins/comments.lua
@@ -0,0 +1,9 @@
+return {
+    'numToStr/Comment.nvim',
+    lazy = false,
+    opts = {
+    },
+    config = function()
+        require("Comment").setup()
+    end
+}
diff --git a/lua/barink/plugins/dadbod-ui.lua b/lua/barink/plugins/dadbod-ui.lua
new file mode 100644
index 0000000..e3565ef
--- /dev/null
+++ b/lua/barink/plugins/dadbod-ui.lua
@@ -0,0 +1,16 @@
+return {
+    "kristijanhusak/vim-dadbod-ui",
+    dependencies = {
+        {'tpope/vim-dadbod', lazy = true },
+        { 'kristijanhusak/vim-dadbod-completion', ft = { 'sql', 'mysql', 'plsql'}, lazy = true },
+    },
+    cmd = {
+        'DBUI',
+        'DBUIToggle',
+        'DBUIAddConnection',
+        'DBUIFindBuffer',
+    },
+    init = function ()
+       vim.g.db_ui_use_nerd_fonts = 1
+    end
+}
diff --git a/lua/barink/plugins/fidget.lua b/lua/barink/plugins/fidget.lua
deleted file mode 100644
index d534814..0000000
--- a/lua/barink/plugins/fidget.lua
+++ /dev/null
@@ -1,8 +0,0 @@
-return {
-        "j-hui/fidget.nvim",
-        opts = {
-            notification = {
-                window = { winblend = 0},
-            },
-        },
-    }
diff --git a/lua/barink/plugins/git-worktree.lua b/lua/barink/plugins/git-worktree.lua
new file mode 100644
index 0000000..0651b59
--- /dev/null
+++ b/lua/barink/plugins/git-worktree.lua
@@ -0,0 +1,14 @@
+return {
+    {
+        'ThePrimeagen/git-worktree.nvim',
+        dependencies = {
+            'nvim-telescope/telescope.nvim',
+        },
+        opts = {},
+        init = function ()
+            require("git-worktree").setup()
+            require("telescope").load_extension("git_worktree")
+        end
+    }
+}
+
diff --git a/lua/barink/plugins/lsp.lua b/lua/barink/plugins/lsp.lua
index c4bfbd9..7c788cc 100644
--- a/lua/barink/plugins/lsp.lua
+++ b/lua/barink/plugins/lsp.lua
@@ -106,6 +106,7 @@ return
             local language_server = {
                 asm_lsp= true,
                 zls = true,
+                emmet_language_server = true,
                 rust_analyzer = true,
                 jdtls = true,
                 pylsp = true,
diff --git a/lua/barink/plugins/noice.lua b/lua/barink/plugins/noice.lua
new file mode 100644
index 0000000..61ebecf
--- /dev/null
+++ b/lua/barink/plugins/noice.lua
@@ -0,0 +1,11 @@
+return {
+    "folke/noice.nvim",
+    event = "VeryLazy",
+    opts = {
+    },
+    dependencies = {
+        "MunifTanjim/nui.nvim",
+        "rcarriga/nvim-notify",
+    },
+
+}
diff --git a/lua/barink/plugins/tokyonight.lua b/lua/barink/plugins/theme.lua
similarity index 93%
rename from lua/barink/plugins/tokyonight.lua
rename to lua/barink/plugins/theme.lua
index 08fbd67..6c5e379 100644
--- a/lua/barink/plugins/tokyonight.lua
+++ b/lua/barink/plugins/theme.lua
@@ -24,7 +24,7 @@ return {
     priority=1000,
     config = function ()
         require("catppuccin").setup()
-        vim.cmd ('colorscheme catppuccin-mocha')
+        vim.cmd.colorscheme('catppuccin')
     end
-}
+    }
 }
diff --git a/lua/barink/plugins/twilight.lua b/lua/barink/plugins/twilight.lua
new file mode 100644
index 0000000..9dab6c3
--- /dev/null
+++ b/lua/barink/plugins/twilight.lua
@@ -0,0 +1,6 @@
+return {
+    {
+        "folke/twilight.nvim",
+        opts = {}
+    }
+}
diff --git a/lua/barink/plugins/vim-dadbod.lua b/lua/barink/plugins/vim-dadbod.lua
new file mode 100644
index 0000000..e49f4b7
--- /dev/null
+++ b/lua/barink/plugins/vim-dadbod.lua
@@ -0,0 +1,3 @@
+return {
+    "tpope/vim-dadbod",
+}
diff --git a/lua/barink/plugins/zen-mode.lua b/lua/barink/plugins/zen-mode.lua
new file mode 100644
index 0000000..eb74732
--- /dev/null
+++ b/lua/barink/plugins/zen-mode.lua
@@ -0,0 +1,4 @@
+return {
+    "folke/zen-mode.nvim",
+    opts = {}
+}