diff --git a/.luarc.json b/.luarc.json
new file mode 100644
index 0000000..1e1765c
--- /dev/null
+++ b/.luarc.json
@@ -0,0 +1,5 @@
+{
+    "diagnostics.globals": [
+        "vim"
+    ]
+}
\ No newline at end of file
diff --git a/lua/plugins/adwaita.lua b/lua/plugins/adwaita.lua
new file mode 100644
index 0000000..6f8ecb1
--- /dev/null
+++ b/lua/plugins/adwaita.lua
@@ -0,0 +1,7 @@
+return {
+    {
+        "Mofiqul/adwaita.nvim",
+        priority = 1000,
+        lazy = false,
+    },
+}
diff --git a/lua/plugins/cmp.lua b/lua/plugins/cmp.lua
index 6186b20..7f93b1b 100644
--- a/lua/plugins/cmp.lua
+++ b/lua/plugins/cmp.lua
@@ -20,14 +20,14 @@ return {
             cmp.setup({
                 window = {
                     completion = {
-                        border = "single",
+                        border = "none",
                         scrollbar = false,
-                        winhighlight = "Normal:CmpPmenu,FloatBorder:FloatBorder,Search:None",
+                        winhighlight = "Normal:Pmenu,FloatBorder:FloatBorder,Search:None",
                     },
                     documentation = {
-                        border = "single",
+                        border = "none",
                         scrollbar = false,
-                        winhighlight = "Normal:CmpPmenu,FloatBorder:FloatBorder,Search:None",
+                        winhighlight = "Normal:Pmenu,FloatBorder:FloatBorder,Search:None",
                     },
                 },
                 snippet = {
@@ -36,17 +36,16 @@ return {
                     end,
                 },
                 completion = {
-                    preselect = "none",
-                    completeopt = "menu,menuone,noinser",
+                    completeopt = "longest,menuone,noinsert,noselect",
                 },
                 sources = cmp.config.sources({
                     { name = "nvim_lsp" },
                     { name = "nvim_lsp_signature_help" },
-                    { name = "vsnip" },
+                    { name = "luasnip" },
                     { name = "buffer" },
                     { name = "path" },
-                    { name = "calc" },
                 }, {
+                    { name = "calc" },
                     { name = "emoji" },
                     { name = "cmdline" },
                     { name = "latex_symbols" },
diff --git a/lua/plugins/conform.lua b/lua/plugins/conform.lua
index 3e4da27..64fbf2d 100644
--- a/lua/plugins/conform.lua
+++ b/lua/plugins/conform.lua
@@ -13,6 +13,7 @@ return {
             formatters_by_ft = {
                 lua = { "stylua" },
                 sh = { "shfmt" },
+                c = { "clangd-format" },
             },
         },
     },
diff --git a/lua/plugins/diffview.lua b/lua/plugins/diffview.lua
new file mode 100644
index 0000000..292ffc6
--- /dev/null
+++ b/lua/plugins/diffview.lua
@@ -0,0 +1,6 @@
+return {
+    {
+        "sindrets/diffview.nvim",
+        opts = {},
+    },
+}
diff --git a/lua/plugins/dressing.lua b/lua/plugins/dressing.lua
new file mode 100644
index 0000000..ad0f237
--- /dev/null
+++ b/lua/plugins/dressing.lua
@@ -0,0 +1,5 @@
+return {
+    {
+        "stevearc/dressing.nvim",
+    },
+}
diff --git a/lua/plugins/eagle.lua b/lua/plugins/eagle.lua
new file mode 100644
index 0000000..f399885
--- /dev/null
+++ b/lua/plugins/eagle.lua
@@ -0,0 +1,10 @@
+return {
+    {
+        "soulis-1256/eagle.nvim",
+        config = function()
+            require("eagle").setup({
+                border = "none",
+            })
+        end,
+    },
+}
diff --git a/lua/plugins/lens.lua b/lua/plugins/lens.lua
new file mode 100644
index 0000000..3d786d4
--- /dev/null
+++ b/lua/plugins/lens.lua
@@ -0,0 +1,16 @@
+return {
+    {
+        "VidocqH/lsp-lens.nvim",
+        config = function()
+            require("lsp-lens").setup({
+                enable = true,
+                sections = {
+                    definition = false,
+                    references = true,
+                    implements = true,
+                    git_authors = true,
+                },
+            })
+        end,
+    },
+}
diff --git a/lua/plugins/lightbulb.lua b/lua/plugins/lightbulb.lua
new file mode 100644
index 0000000..ce3b3db
--- /dev/null
+++ b/lua/plugins/lightbulb.lua
@@ -0,0 +1,24 @@
+return {
+    {
+        "kosayoda/nvim-lightbulb",
+        opts = {
+            autocmd = { enabled = true },
+            sign = {
+                enabled = false,
+            },
+            float = {
+                enabled = true,
+                -- Text to show in the floating window.
+                text = "💡",
+                -- Highlight group to highlight the floating window.
+                hl = "LightBulbFloatWin",
+                -- Window options.
+                -- See |vim.lsp.util.open_floating_preview| and |nvim_open_win|.
+                -- Note that some options may be overridden by |open_floating_preview|.
+                win_opts = {
+                    focusable = false,
+                },
+            },
+        },
+    },
+}
diff --git a/lua/plugins/lualine.lua b/lua/plugins/lualine.lua
index a816060..2f8ee5b 100644
--- a/lua/plugins/lualine.lua
+++ b/lua/plugins/lualine.lua
@@ -5,7 +5,7 @@ return {
             local options = require("options")
             return {
                 options = {
-                    theme = "vscode",
+                    theme = "auto",
                     component_separators = { left = "", right = "" },
                     section_separators = { left = "", right = "" },
                     globalstatus = true,
diff --git a/lua/plugins/moderndark.lua b/lua/plugins/moderndark.lua
new file mode 100644
index 0000000..abcf060
--- /dev/null
+++ b/lua/plugins/moderndark.lua
@@ -0,0 +1,14 @@
+return {
+    {
+        "gmr458/vscode_modern_theme.nvim",
+        lazy = false,
+        priority = 1000,
+        config = function()
+            require("vscode_modern").setup({
+                cursorline = true,
+                transparent_background = false,
+                nvim_tree_darker = true,
+            })
+        end,
+    },
+}
diff --git a/lua/plugins/satellite.lua b/lua/plugins/satellite.lua
new file mode 100644
index 0000000..2c8af0e
--- /dev/null
+++ b/lua/plugins/satellite.lua
@@ -0,0 +1,6 @@
+return {
+    {
+        "lewis6991/satellite.nvim",
+        opts = {},
+    },
+}
diff --git a/lua/plugins/statuscol.lua b/lua/plugins/statuscol.lua
index 4ee8cbe..f2b9801 100644
--- a/lua/plugins/statuscol.lua
+++ b/lua/plugins/statuscol.lua
@@ -9,6 +9,7 @@ return {
                     "toggleterm",
                     "dashboard",
                     "aerial",
+                    "zsh",
                     "NvimTree",
                 },
                 segments = {
diff --git a/lua/plugins/todo.lua b/lua/plugins/todo.lua
new file mode 100644
index 0000000..6667253
--- /dev/null
+++ b/lua/plugins/todo.lua
@@ -0,0 +1,7 @@
+return {
+    {
+        "folke/todo-comments.nvim",
+        dependencies = { "nvim-lua/plenary.nvim" },
+        opts = {},
+    },
+}
diff --git a/lua/plugins/tokyonight.lua b/lua/plugins/tokyonight.lua
new file mode 100644
index 0000000..5c4fb1a
--- /dev/null
+++ b/lua/plugins/tokyonight.lua
@@ -0,0 +1,8 @@
+return {
+    {
+        "folke/tokyonight.nvim",
+        lazy = false,
+        priority = 1000,
+        opts = {},
+    },
+}
diff --git a/lua/plugins/vscode-theme.lua b/lua/plugins/vscode-theme.lua
deleted file mode 100644
index 3a72b91..0000000
--- a/lua/plugins/vscode-theme.lua
+++ /dev/null
@@ -1,11 +0,0 @@
-return {
-    {
-        "Mofiqul/vscode.nvim",
-        priority = 1,
-        opts = {
-            style = "dark",
-            transparent = true,
-            italic_comments = false,
-        },
-    },
-}
diff --git a/lua/plugins/vscode.lua b/lua/plugins/vscode.lua
new file mode 100644
index 0000000..8c69930
--- /dev/null
+++ b/lua/plugins/vscode.lua
@@ -0,0 +1,16 @@
+return {
+    {
+        "Mofiqul/vscode.nvim",
+        lazy = false,
+        priority = 1000,
+        opts = {
+            color_overrides = {},
+            group_overrides = {
+                DiffDelete = {
+                    fg = "#5A5A5A",
+                    bg = "#1f1f1f",
+                },
+            },
+        },
+    },
+}