diff --git a/lazy-lock.json b/lazy-lock.json
index 7b7644d..48735e4 100644
--- a/lazy-lock.json
+++ b/lazy-lock.json
@@ -10,6 +10,7 @@
   "cmp-nvim-lua": { "branch": "main", "commit": "f12408bdb54c39c23e67cab726264c10db33ada8" },
   "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" },
   "conform.nvim": { "branch": "master", "commit": "63e0a32c85a39484813957dc480f171907aa90b9" },
+  "diffview.nvim": { "branch": "main", "commit": "3afa6a053f680e9f1329c4a151db988a482306cd" },
   "dressing.nvim": { "branch": "master", "commit": "e3714c8049b2243e792492c4149e4cc395c68eb9" },
   "flutter-tools.nvim": { "branch": "main", "commit": "990a1349c29f7d474a0cd51355aba773ccc9deea" },
   "harpoon": { "branch": "harpoon2", "commit": "0378a6c428a0bed6a2781d459d7943843f374bce" },
@@ -22,6 +23,7 @@
   "mini.indentscope": { "branch": "main", "commit": "cf07f19e718ebb0bcc5b00999083ce11c37b8d40" },
   "mini.surround": { "branch": "main", "commit": "a1b590cc3b676512de507328d6bbab5e43794720" },
   "neogen": { "branch": "main", "commit": "6de0add4805165317ab7d3d36b5cef48b1b865f3" },
+  "neogit": { "branch": "master", "commit": "67eb1a73974a0bff367dc401479e7e01fad7ff05" },
   "nvim-cmp": { "branch": "main", "commit": "5260e5e8ecadaf13e6b82cf867a909f54e15fd07" },
   "nvim-lightbulb": { "branch": "master", "commit": "8f00b89dd1b1dbde16872bee5fbcee2e58c9b8e9" },
   "nvim-lspconfig": { "branch": "master", "commit": "710a8fa7379db32199545f30ea01dd8446b9302f" },
@@ -38,7 +40,6 @@
   "vim-dadbod": { "branch": "master", "commit": "7888cb7164d69783d3dce4e0283decd26b82538b" },
   "vim-dadbod-completion": { "branch": "master", "commit": "5d5ad196fcde223509d7dabbade0148f7884c5e3" },
   "vim-dadbod-ui": { "branch": "master", "commit": "0dc68d9225a70d42f8645049482e090c1a8dce25" },
-  "vim-fugitive": { "branch": "master", "commit": "4f59455d2388e113bd510e85b310d15b9228ca0d" },
   "vim-illuminate": { "branch": "master", "commit": "5eeb7951fc630682c322e88a9bbdae5c224ff0aa" },
   "vim-tmux-navigator": { "branch": "master", "commit": "5b3c701686fb4e6629c100ed32e827edf8dad01e" }
 }
\ No newline at end of file
diff --git a/lua/409/plugins/git.lua b/lua/409/plugins/git.lua
index 18cdddb..e3f2343 100644
--- a/lua/409/plugins/git.lua
+++ b/lua/409/plugins/git.lua
@@ -1,6 +1,32 @@
 return {
 	{
+		"NeogitOrg/neogit",
+		dependencies = {
+			"nvim-lua/plenary.nvim", -- required
+			"sindrets/diffview.nvim", -- optional - Diff integration
+
+			"nvim-telescope/telescope.nvim", -- optional
 		},
+        keys = {
+            {
+                "<leader>gs",
+                ":Neogit<CR>",
+                desc = "Neogit"
+            },
+        },
+        opts = {
+            signs = {
+                item = { ">", "v" },
+                section = { ">", "v" },
+            },
+            mappings = {
+                status = {
+                    ["="] = "Toggle",
+                    ["<tab>"] = false,
+                },
+            },
+        },
+		config = true,
 	},
 	{
 		"echasnovski/mini.diff",
diff --git a/lua/409/plugins/theme.lua b/lua/409/plugins/theme.lua
index 068f233..92cf711 100644
--- a/lua/409/plugins/theme.lua
+++ b/lua/409/plugins/theme.lua
@@ -22,6 +22,23 @@ return {
             vim.api.nvim_set_hl(0, "PmenuSbar", { link = "Normal" })
             vim.api.nvim_set_hl(0, "CmpPmenuBorder", { fg = catppuccin_colors.surface2 })
             vim.api.nvim_set_hl(0, "MiniIndentscopeSymbol", { fg = catppuccin_colors.surface2 })
+
+            vim.api.nvim_set_hl(0, "NeogitHunkHeaderCursor", { fg = catppuccin_colors.blue, bg = "none", bold = true })
+            vim.api.nvim_set_hl(0, "NeogitHunkHeader", { fg = catppuccin_colors.blue, bg = "none", bold = true })
+            vim.api.nvim_set_hl(0, "NeogitHunkHeaderHighlight", { link = "NeogitHunkHeader" })
+            vim.api.nvim_set_hl(0, "NeogitDiffAddHighlight", { fg = catppuccin_colors.green, bg = "none" })
+            vim.api.nvim_set_hl(0, "NeogitDiffDeleteHighlight", { fg = catppuccin_colors.red, bg = "none" })
+            vim.api.nvim_set_hl(0, "NeogitDiffContextHighlight", { link = "Normal" })
+            vim.api.nvim_set_hl(0, "NeogitDiffContextCursor", { link = "Normal" })
+            vim.api.nvim_set_hl(0, "NeogitDiffAddCursor", { link = "NeogitDiffAddHighlight" })
+            vim.api.nvim_set_hl(0, "NeogitDiffDeleteCursor", { link = "NeogitDiffDeleteHighlight" })
+
+            vim.api.nvim_set_hl(0, "NeogitDiffHeader", { fg = catppuccin_colors.blue, bg = "none", bold = true })
+            vim.api.nvim_set_hl(0, "NeogitDiffAdd", { link = "NeogitDiffAddHighlight" })
+            vim.api.nvim_set_hl(0, "NeogitDiffDelete", { link = "NeogitDiffDeleteHighlight" })
+            vim.api.nvim_set_hl(0, "NeogitDiffContext", { link = "NeogitDiffContextHighlight" })
+
+            vim.api.nvim_set_hl(0, "NeogitCommitViewHeader", { fg = catppuccin_colors.blue, bg = "none", bold = true })
         end
     },
 }