diff --git a/init.lua b/init.lua
index cbf9ff65d67..07218c87042 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 00000000000..729bba6a25b
--- /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 be0eb9d8d7a..00000000000
--- a/lua/custom/plugins/init.lua
+++ /dev/null
@@ -1,5 +0,0 @@
--- 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 {}
diff --git a/lua/custom/plugins/tmux.lua b/lua/custom/plugins/tmux.lua
new file mode 100644
index 00000000000..9913ea4d2e4
--- /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/omp.json b/omp.json
new file mode 100644
index 00000000000..ad31f31f6ec
--- /dev/null
+++ b/omp.json
@@ -0,0 +1,146 @@
+{
+  "$schema": "https://raw.githubusercontent.com/JanDeDobbeleer/oh-my-posh/main/themes/schema.json",
+  "console_title_template": " {{ .Folder }} :: {{if .Root}}Admin{{end}}",
+  "palette": {
+    "main-bg": "#24283b",
+    "terminal-red": "#f7768e",
+    "pistachio-green": "#9ece6a",
+    "terminal-green": "#73daca",
+    "terminal-yellow": "#e0af68",
+    "terminal-blue": "#7aa2f7",
+    "celeste-blue": "#b4f9f8",
+    "light-sky-blue": "#7dcfff",
+    "terminal-white": "#c0caf5",
+    "white-blue": "#a9b1d6",
+    "blue-bell": "#9aa5ce",
+    "pastal-grey": "#cfc9c2",
+    "terminal-magenta": "#bb9af7",
+    "blue-black": "#565f89",
+    "terminal-black": "#414868",
+    "t-background": "p:main-bg"
+  },
+  "blocks": [
+    {
+      "alignment": "left",
+      "segments": [
+        {
+          "type": "text",
+          "style": "plain",
+          "background": "transparent",
+          "foreground": "p:terminal-blue",
+          "template": "\u279c "
+        },
+        {
+          "type": "path",
+          "style": "plain",
+          "foreground": "p:terminal-magenta",
+          "properties": {
+            "style": "folder"
+          },
+          "template": "<b>{{ .Path }}</b> <p:light-sky-blue>\u26a1</>"
+        },
+        {
+          "type": "git",
+          "style": "plain",
+          "foreground": "p:light-sky-blue",
+          "foreground_templates": [
+            "{{ if or (.Working.Changed) (.Staging.Changed) }}p:terminal-red{{ end }}",
+            "{{ if and (gt .Ahead 0) (gt .Behind 0)}}p:light-sky-blue {{ end }}",
+            "{{ if gt .Ahead 0 }}p:terminal-blue{{ end }}",
+            "{{ if gt .Behind 0 }}p:celeste-blue{{ end }}"
+          ],
+          "template": "({{ .HEAD}})",
+          "properties": {
+            "fetch_status": true,
+            "branch_icon": "\ue725 "
+          }
+        },
+        {
+          "type": "status",
+          "style": "plain",
+          "foreground": "p:terminal-red",
+          "template": " \uf00d"
+        }
+      ],
+      "type": "prompt"
+    },
+    {
+      "alignment": "right",
+      "overflow": "hide",
+      "segments": [
+        {
+          "type": "node",
+          "style": "plain",
+          "foreground": "p:pistachio-green",
+          "template": "\ue718 {{ .Full }} "
+        },
+        {
+          "type": "php",
+          "style": "plain",
+          "foreground": "p:terminal-blue",
+          "template": "\ue73d {{ .Full }} "
+        },
+        {
+          "type": "python",
+          "style": "plain",
+          "foreground": "p:terminal-yellow",
+          "template": "\uE235 {{ .Full }}"
+        },
+        {
+          "type": "julia",
+          "style": "plain",
+          "foreground": "p:terminal-magenta",
+          "template": "\uE624 {{ .Full }}"
+        },
+        {
+          "type": "ruby",
+          "style": "plain",
+          "foreground": "p:terminal-red",
+          "template": "\uE791 {{ .Full}}"
+        },
+        {
+          "type": "go",
+          "style": "plain",
+          "foreground": "p:light-sky-blue",
+          "template": "\uFCD1 {{ .Full}}"
+        },
+        {
+          "type": "command",
+          "style": "plain",
+          "foreground": "p:white-blue",
+          "properties": {
+            "command": "git log --pretty=format:%cr -1 || date +%H:%M:%S",
+            "shell": "bash"
+          }
+        }
+      ],
+      "type": "prompt"
+    },
+    {
+      "alignment": "left",
+      "newline": true,
+      "segments": [
+        {
+          "foreground": "p:pistachio-green",
+          "style": "plain",
+          "template": "\u25b6",
+          "type": "text"
+        }
+      ],
+      "type": "prompt"
+    }
+  ],
+  "secondary_prompt": {
+    "background": "transparent",
+    "foreground": "p:terminal-blue",
+    "template": "\u279c "
+  },
+  "transient_prompt": {
+    "background": "p:t-background",
+    "foreground": "p:terminal-blue",
+    "template": "\u279c "
+  },
+  "final_space": true,
+  "version": 3,
+  "terminal_background": "p:t-background"
+}