diff --git a/modules/nvim/config/colors/winterly.lua b/modules/nvim/config/colors/winterly.lua
index 17a3d00..692f1d2 100644
--- a/modules/nvim/config/colors/winterly.lua
+++ b/modules/nvim/config/colors/winterly.lua
@@ -131,6 +131,7 @@ hi("SnippetTabstopActive", { link = "SnippetTabstop" })
 -- Text
 hi("@markup.raw", { link = "Special" })
 hi("@markup.link", { link = "Identifier" })
+hi("@markup.link.label", { link = "ConstantUnderlined" })
 hi("@markup.heading", { link = "Title" })
 hi("@markup.heading.gitcommit", { bg = palette.bg, fg = palette.fg, bold = true })
 hi("@markup.link.url", { link = "Underlined" })
@@ -277,6 +278,7 @@ else
   hi("Comment", { fg = palette.grey, ctermfg = "Cyan" })
   hi("Unused", { fg = palette.grey_bright, undercurl = true, ctermfg = "LightGrey" })
   hi("Constant", { fg = palette.yellow_brighter, ctermfg = "LightYellow" })
+  hi("ConstantUnderlined", { fg = palette.yellow_brighter, underline = true, ctermfg = "LightYellow" })
   hi("Special", { fg = palette.silver, ctermfg = "LightGrey" })
   hi("Identifier", { fg = palette.fg, ctermfg = "White", cterm = { bold = true } })
   hi("Statement", { fg = palette.fg_alt, bold = true, ctermfg = "White" })
diff --git a/modules/nvim/config/lua/plugins/gitportal.lua b/modules/nvim/config/lua/plugins/gitportal.lua
new file mode 100644
index 0000000..98ad0b7
--- /dev/null
+++ b/modules/nvim/config/lua/plugins/gitportal.lua
@@ -0,0 +1,24 @@
+return {
+  "trevorhauter/gitportal.nvim",
+  opts = {
+    always_include_current_line = true,
+    switch_branch_or_commit_upon_ingestion = "ask_first",
+  },
+  keys = {
+    {
+      "<leader>gll",
+      "<cmd>GitPortal<cr>",
+      desc = "Browse file at git remote",
+    },
+    {
+      "<leader>gly",
+      "<cmd>GitPortal copy_link_to_clipboard<cr>",
+      desc = "Yank git link to clipboard",
+    },
+    {
+      "<leader>glo",
+      "<cmd>GitPortal open_link<cr>",
+      desc = "Browse file at git remote",
+    },
+  },
+}
diff --git a/modules/nvim/config/lua/plugins/git.lua b/modules/nvim/config/lua/plugins/neogit.lua
similarity index 89%
rename from modules/nvim/config/lua/plugins/git.lua
rename to modules/nvim/config/lua/plugins/neogit.lua
index 8066ed4..8955ec7 100644
--- a/modules/nvim/config/lua/plugins/git.lua
+++ b/modules/nvim/config/lua/plugins/neogit.lua
@@ -10,7 +10,6 @@ return {
   keys = {
     { "<leader>gg", "<cmd>Neogit<cr>", desc = "Open neogit", mode = "n" },
     { "<leader>gc", "<cmd>Neogit commit<cr>", desc = "Open neogit commit UI", mode = "n" },
-    { "<leader>gb", "<cmd>Neogit branch<cr>", desc = "Open neogit branch UI", mode = "n" },
     { "<leader>gp", "<cmd>Neogit push<cr>", desc = "Open neogit push UI", mode = "n" },
     { "<leader>gf", "<cmd>Neogit pull<cr>", desc = "Open neogit pull UI", mode = "n" },
     { "<leader>gm", "<cmd>Neogit merge<cr>", desc = "Open neogit merge UI", mode = "n" },
diff --git a/modules/nvim/config/lua/plugins/snacks.lua b/modules/nvim/config/lua/plugins/snacks.lua
index a481640..54db56b 100644
--- a/modules/nvim/config/lua/plugins/snacks.lua
+++ b/modules/nvim/config/lua/plugins/snacks.lua
@@ -14,11 +14,12 @@ return {
   lazy = false,
   opts = {
     bigfile = { enabled = true },
+    bufdelete = { enabled = true },
     git = { enabled = true },
-    gitbrowse = {
-      enabled = true,
-      what = "commit",
-    },
+    -- TODO: Integrate GH and see how that works out
+    -- gh = {
+    --  enabled = true
+    -- }
     indent = {
       enabled = true,
     },
@@ -51,13 +52,6 @@ return {
       end,
       desc = "Show git blame for current line",
     },
-    {
-      "<leader>gl",
-      function()
-        Snacks.gitbrowse()
-      end,
-      desc = "Open link to line at git remote",
-    },
     -- Zen Mode
     {
       "<leader>z",
@@ -104,10 +98,31 @@ return {
       desc = "Projects",
     },
     {
-      "<leader>bb",
+      "<leader>bl",
       function()
         Snacks.picker.buffers()
       end,
+      desc = "List buffers",
+    },
+    {
+      "<leader>bd",
+      function()
+        Snacks.bufdelete()
+      end,
+      desc = "Buffers",
+    },
+    {
+      "<leader>bD",
+      function()
+        Snacks.bufdelete.all()
+      end,
+      desc = "Buffers",
+    },
+    {
+      "<leader>bo",
+      function()
+        Snacks.bufdelete.other()
+      end,
       desc = "Buffers",
     },
     -- Search
diff --git a/modules/nvim/config/lua/plugins/snipe.lua b/modules/nvim/config/lua/plugins/snipe.lua
new file mode 100644
index 0000000..4ff020d
--- /dev/null
+++ b/modules/nvim/config/lua/plugins/snipe.lua
@@ -0,0 +1,19 @@
+return {
+  "leath-dub/snipe.nvim",
+  keys = {
+    {
+      "<leader>bb",
+      function()
+        require("snipe").open_buffer_menu()
+      end,
+      desc = "Open Snipe buffer menu",
+    },
+  },
+  opts = {
+    position = "center",
+    open_win_override = {
+      title = "Select buffer",
+      border = "rounded",
+    },
+  },
+}
diff --git a/modules/nvim/config/lua/plugins/which-key.lua b/modules/nvim/config/lua/plugins/which-key.lua
index 7e05765..80346c8 100644
--- a/modules/nvim/config/lua/plugins/which-key.lua
+++ b/modules/nvim/config/lua/plugins/which-key.lua
@@ -22,12 +22,6 @@ return {
         mode = "n",
       },
       { "<leader>b", group = "+buffer", mode = "n" },
-      {
-        "<leader>bd",
-        "<Cmd>bd!<CR>",
-        desc = "Delete current buffer",
-        mode = "n",
-      },
       {
         "<leader>bn",
         "<Cmd>bn<CR>",
@@ -40,6 +34,12 @@ return {
         desc = "Move to previous buffer",
         mode = "n",
       },
+      {
+        "<leader>bk",
+        "<Cmd>bn<CR>",
+        desc = "Kill buffer and window",
+        mode = "n",
+      },
       { "<leader>c", group = "+code", mode = "n" },
       {
         "<leader>cr",