diff --git a/init.lua b/init.lua
index cbf9ff65..07218c87 100644
--- a/init.lua
+++ b/init.lua
@@ -1001,8 +1001,9 @@ require('lazy').setup({
   --    This is the easiest way to modularize your config.
   --
   --  Uncomment the following line and add your plugins to `lua/custom/plugins/*.lua` to get going.
-  -- { import = 'custom.plugins' },
   --
+  { import = 'custom.plugins' },
+  { import = 'kickstart.plugins' },
   -- For additional information with loading, sourcing and examples see `:help lazy.nvim-🔌-plugin-spec`
   -- Or use telescope!
   -- In normal mode type `<space>sh` then write `lazy.nvim-plugin`
diff --git a/lua/custom/plugins/harpoon.lua b/lua/custom/plugins/harpoon.lua
new file mode 100644
index 00000000..729bba6a
--- /dev/null
+++ b/lua/custom/plugins/harpoon.lua
@@ -0,0 +1,33 @@
+return {
+	"ThePrimeagen/harpoon",
+	branch = "harpoon2",
+	dependencies = { "nvim-lua/plenary.nvim" },
+	config = function()
+		local harpoon = require("harpoon")
+
+		-- REQUIRED
+		harpoon:setup()
+		-- REQUIRED
+
+		vim.keymap.set("n", "<leader>ha", function()
+			harpoon:list():add()
+		end)
+    vim.keymap.set("n", "<leader>hr", function()
+        harpoon:list():remove()
+      if (harpoon.ui.open) then
+        harpoon:list()
+        harpoon.ui:refresh()
+      end
+    end)
+		vim.keymap.set("n", "<leader>hh", function()
+			harpoon.ui:toggle_quick_menu(harpoon:list())
+		end)
+		-- Toggle previous & next buffers stored within Harpoon list
+		vim.keymap.set("n", "<leader>hk", function()
+			harpoon:list():prev()
+		end)
+		vim.keymap.set("n", "<leader>hj", function()
+			harpoon:list():next()
+		end)
+	end,
+}
diff --git a/lua/custom/plugins/init.lua b/lua/custom/plugins/init.lua
deleted file mode 100644
index dbbd8be4..00000000
--- a/lua/custom/plugins/init.lua
+++ /dev/null
@@ -1,7 +0,0 @@
-local vimux = require 'vimux.lua'
-
--- You can add your own plugins here or in other files in this directory!
---  I promise not to create any merge conflicts in this directory :)
---
--- See the kickstart.nvim README for more information
-return vimux
diff --git a/lua/custom/plugins/tmux.lua b/lua/custom/plugins/tmux.lua
new file mode 100644
index 00000000..9913ea4d
--- /dev/null
+++ b/lua/custom/plugins/tmux.lua
@@ -0,0 +1,7 @@
+return {
+  "christoomey/vim-tmux-navigator",
+  vim.keymap.set("n", "C-h", ":TmuxNavigateLeft<CR>"),
+  vim.keymap.set("n", "C-j", ":TmuxNavigateDown<CR>"),
+  vim.keymap.set("n", "C-k", ":TmuxNavigateUp<CR>"),
+  vim.keymap.set("n", "C-l", ":TmuxNavigateRight<CR>")
+}
diff --git a/lua/custom/plugins/vimux.lua b/lua/custom/plugins/vimux.lua
deleted file mode 100644
index eb1d5d36..00000000
--- a/lua/custom/plugins/vimux.lua
+++ /dev/null
@@ -1,12 +0,0 @@
-return {
-  "vim-test/vim-test",
-  dependencies = {
-    "preservim/vimux",
-  },
-  vim.keymap.set("n", "<leader>t", ":TestNearest<CR>"),
-  vim.keymap.set("n", "<leader>T", ":TestFile<CR>"),
-  vim.keymap.set("n", "<leader>a", ":TestSuite<CR>"),
-  vim.keymap.set("n", "<leader>l", ":TestLast<CR>"),
-  vim.keymap.set("n", "<leader>g", ":TestVisit<CR>"),
-  vim.cmd("let test#strategy = 'vimux'"),
-}