diff --git a/lua/config/lazy.lua b/lua/config/lazy.lua
index 073effa..248261e 100644
--- a/lua/config/lazy.lua
+++ b/lua/config/lazy.lua
@@ -23,6 +23,7 @@ require("lazy").setup({
 		{ import = "plugins" },
 		{ import = "plugins/ui" },
 		{ import = "plugins/tools" },
+		{ import = "plugins/colorschemes" },
 	},
 	defaults = {
 		lazy = false,
diff --git a/lua/plugins/cmp.lua b/lua/plugins/cmp.lua
index 1eee4c1..8ed18c6 100644
--- a/lua/plugins/cmp.lua
+++ b/lua/plugins/cmp.lua
@@ -70,7 +70,7 @@ return {
 			}),
 		})
 
-		require("cmp_git").setup()
+		require("cmp_git").setup({})
 
 		-- Use buffer source for `/` and `?` (if you enabled `native_menu`, this won't work anymore).
 		cmp.setup.cmdline({ "/", "?" }, {
diff --git a/lua/plugins/colorschemes/tokyonight.lua b/lua/plugins/colorschemes/tokyonight.lua
new file mode 100644
index 0000000..3e7e943
--- /dev/null
+++ b/lua/plugins/colorschemes/tokyonight.lua
@@ -0,0 +1,8 @@
+return {
+	"folke/tokyonight.nvim",
+	lazy = true,
+	opts = {},
+	config = function()
+		vim.cmd("colorscheme tokyonight-night")
+	end,
+}
diff --git a/lua/plugins/incline.lua b/lua/plugins/incline.lua
deleted file mode 100644
index 9f0daf9..0000000
--- a/lua/plugins/incline.lua
+++ /dev/null
@@ -1,6 +0,0 @@
-return {
-	"b0o/incline.nvim",
-	opts = {},
-	-- Optional: Lazy load Incline
-	event = "VeryLazy",
-}
diff --git a/lua/plugins/main.lua b/lua/plugins/main.lua
index 23b164b..ca7d2a2 100644
--- a/lua/plugins/main.lua
+++ b/lua/plugins/main.lua
@@ -29,26 +29,7 @@ return {
 			require("telescope").load_extension("file_browser")
 		end,
 	},
-	{
-		"direnv/direnv.vim",
-	},
-	{
-		"akinsho/toggleterm.nvim",
-		version = "*",
-		opts = {
-			direction = "float",
-		},
-		config = function(_, opts)
-			local Terminal = require("toggleterm.terminal").Terminal
-			local lazygit = Terminal:new({ cmd = "lazygit", hidden = true, direction = "float" })
-
-			function _Lazygit_toggle()
-				lazygit:toggle()
-			end
-
-			require("toggleterm").setup(opts)
-		end,
-	},
+	"direnv/direnv.vim",
 	--:}}}
 	--: Visuals {{u{
 	{
@@ -110,13 +91,6 @@ return {
 	{
 		"stevearc/dressing.nvim",
 	},
-	{
-		"folke/tokyonight.nvim",
-		lazy = true,
-		opts = {},
-		config = function()
-			vim.cmd("colorscheme tokyonight-night")
-		end,
-	},
+
 	--:}}}
 }
diff --git a/lua/plugins/telescope.lua b/lua/plugins/telescope.lua
index 6898dad..87f5c51 100644
--- a/lua/plugins/telescope.lua
+++ b/lua/plugins/telescope.lua
@@ -14,5 +14,10 @@ return { -- fuzzy file finder
 			require("telescope.builtin").current_buffer_fuzzy_find,
 			desc = "Search for a string in the current buffer",
 		},
+		{
+			"<leader>ff",
+			require("telescope.builtin").find_files,
+			desc = "Find File",
+		},
 	},
 }
diff --git a/lua/plugins/trouble.lua b/lua/plugins/trouble.lua
index 75d84a2..74e848c 100644
--- a/lua/plugins/trouble.lua
+++ b/lua/plugins/trouble.lua
@@ -1,11 +1,28 @@
 return {
 	"folke/trouble.nvim",
 	dependencies = { "nvim-tree/nvim-web-devicons" },
+	event = "CmdlineEnter",
 	---@type trouble.Config
 	opts = {
 		---@type trouble.Window.opts
 		win = { type = "split", position = "right" },
 		auto_close = true,
+		---@type table<string, trouble.Mode>
+		modes = {
+			-- sources define their own modes, which you can use directly,
+			-- or override like in the example below
+			lsp_references = {
+				-- some modes are configurable, see the source code for more details
+				params = {
+					include_declaration = true,
+				},
+			},
+		},
+		icons = {
+			indent = {
+				last = "╰╴", -- rounded
+			},
+		},
 	},
 	keys = {
 		{
diff --git a/lua/plugins/which-key.lua b/lua/plugins/which-key.lua
index 4954ca4..25d2135 100644
--- a/lua/plugins/which-key.lua
+++ b/lua/plugins/which-key.lua
@@ -16,7 +16,6 @@ return {
 		{ "<leader>c", desc = "NerdCommenter" },
 		{ "<leader>f", desc = "Telescope - Finder" },
 		{ "<leader>fb", "<cmd>Telescope buffers<CR>", desc = "Find Open Buffers" },
-		{ "<leader>ff", require("telescope").extensions.file_browser.file_browser, desc = "Find File" },
 		{ "<leader>fg", "<cmd>Telescope live_grep<CR>", desc = "Live Grep" },
 		{ "<leader>fh", "<cmd>Telescope help_tags<CR>", desc = "Find Help" },
 		{ "<leader>fi", "<cmd>Telescope builtin<cr>", desc = "Search all Telescope builtins" },
@@ -28,6 +27,5 @@ return {
 		{ "<leader>r", "<cmd>lua vim.lsp.buf.rename()<CR>", desc = "Rename a token" },
 		{ "<leader>t1", "<Cmd>BufferGoto 1<CR>", desc = "Go to Buffer 1" },
 		{ "<leader>td", "<Cmd>BufferClose<CR>", desc = "Close Current Buffer" },
-		{ "<leader>tt", require("telescope").extensions.file_browser.file_browser, desc = "Open the file browser" },
 	},
 }