diff --git a/init.lua b/init.lua
index cbd3f1a..b057c40 100644
--- a/init.lua
+++ b/init.lua
@@ -10,44 +10,4 @@ else
 	-- ╰──────────────────────────────────────────────────────╯
 
 	vim.cmd.colorscheme("rose-pine-moon")
-
-	-- Keybind for saving clipboard screenshot and inserting a Markdown link
-	vim.api.nvim_set_keymap(
-		"n",
-		"<leader>ps",
-		":lua SaveScreenshotAndInsertLink()<CR>",
-		{ noremap = true, silent = true }
-	)
-
-	function SaveScreenshotAndInsertLink()
-		-- Prompt for Hugo base directory if needed
-
-		-- Define the Hugo base directory and screenshot subfolder path
-		local base_dir
-		local current_file_dir = vim.fn.expand("%:p:h")
-
-		-- Detect base dir by looking for the Hugo structure, or prompt if not found
-		if current_file_dir:match("/content/") then
-			base_dir = current_file_dir:match("(.*)/content/")
-		else
-			-- Prompt for Hugo base directory if automatic detection fails
-			base_dir = vim.fn.input("Enter base directory of your Hugo site: ", "", "file")
-		end
-
-		local img_folder = base_dir .. "/static/images/screenshots/"
-		vim.fn.mkdir(img_folder, "p") -- Ensure the directory exists
-
-		-- Define the image name and full path
-		local img_name = os.date("%Y-%m-%d_%H-%M-%S") .. ".png"
-		local full_path = img_folder .. img_name
-
-		-- Save clipboard image as binary PNG file using wl-paste
-		os.execute("wl-paste --type image/png > " .. full_path)
-
-		-- Insert markdown image link at cursor position
-		local img_markdown = "![](/images/screenshots/" .. img_name .. ")\n"
-		vim.api.nvim_put({ img_markdown }, "c", true, true)
-
-		print("Screenshot saved and link added: " .. full_path)
-	end
 end
diff --git a/lua/pika/core/init.lua b/lua/pika/core/init.lua
index 4e41d6e..f020bcd 100644
--- a/lua/pika/core/init.lua
+++ b/lua/pika/core/init.lua
@@ -1,3 +1,5 @@
 require("pika.core.options")
 require("pika.core.keymaps")
+require("pika.core.custom")
 require("pika.core.custom.terminalcmd")
+require("pika.core.custom.hugopaste")
diff --git a/lua/pika/core/options.lua b/lua/pika/core/options.lua
index 47fe86c..3d78ec5 100644
--- a/lua/pika/core/options.lua
+++ b/lua/pika/core/options.lua
@@ -54,7 +54,10 @@ o.swapfile = false
 
 -- Disable the tilde on empty lines
 -- enable slimline bubble chain ( )----( )
-o.fillchars = { eob = " ", stl = "─" }
+o.fillchars = {
+	eob = " ",
+	-- stl = "─",
+}
 
 -- SudaRead automatic if file is inaccessible
 vim.g.suda_smart_edit = 1
diff --git a/lua/pika/plugins/git.lua b/lua/pika/plugins/git.lua
index b6cfc5c..33c4271 100644
--- a/lua/pika/plugins/git.lua
+++ b/lua/pika/plugins/git.lua
@@ -1,156 +1,162 @@
 return {
 	{
-		"tanvirtin/vgit.nvim",
-		dependencies = { "nvim-lua/plenary.nvim", "nvim-tree/nvim-web-devicons" },
-		-- Lazy loading on 'VimEnter' event is necessary.
-		event = "VimEnter",
-		config = function()
-			require("vgit").setup(
-				-- keymaps = {
-				-- 	["n <C-k>"] = {
-				-- 		function()
-				-- 			require("vgit").hunk_up()
-				-- 		end,
-				-- 		desc = "VGit Hunk Up",
-				-- 	},
-				-- 	["n <C-j>"] = {
-				-- 		function()
-				-- 			require("vgit").hunk_down()
-				-- 		end,
-				-- 		desc = "VGit Hunk Down",
-				-- 	},
-				-- 	["n <leader>gs"] = {
-				-- 		function()
-				-- 			require("vgit").buffer_hunk_stage()
-				-- 		end,
-				-- 		desc = "VGit Stage Hunk",
-				-- 	},
-				-- 	["n <leader>gr"] = {
-				-- 		function()
-				-- 			require("vgit").buffer_hunk_reset()
-				-- 		end,
-				-- 		desc = "VGit Reset Hunk",
-				-- 	},
-				-- 	["n <leader>gp"] = {
-				-- 		function()
-				-- 			require("vgit").buffer_hunk_preview()
-				-- 		end,
-				-- 		desc = "VGit Preview Hunk",
-				-- 	},
-				-- 	["n <leader>gb"] = {
-				-- 		function()
-				-- 			require("vgit").buffer_blame_preview()
-				-- 		end,
-				-- 		desc = "VGit Blame Preview",
-				-- 	},
-				-- 	["n <leader>gf"] = {
-				-- 		function()
-				-- 			require("vgit").buffer_diff_preview()
-				-- 		end,
-				-- 		desc = "VGit Diff Preview",
-				-- 	},
-				-- 	["n <leader>gh"] = {
-				-- 		function()
-				-- 			require("vgit").buffer_history_preview()
-				-- 		end,
-				-- 		desc = "VGit History Preview",
-				-- 	},
-				-- 	["n <leader>gu"] = {
-				-- 		function()
-				-- 			require("vgit").buffer_reset()
-				-- 		end,
-				-- 		desc = "VGit Reset Buffer",
-				-- 	},
-				-- 	["n <leader>gcm"] = {
-				-- 		function()
-				-- 			require("vgit").project_commit_preview()
-				-- 		end,
-				-- 		desc = "VGit Commit Preview",
-				-- 	},
-				-- 	["n <leader>gcc"] = {
-				-- 		function()
-				-- 			require("vgit").project_commits_preview()
-				-- 		end,
-				-- 		desc = "VGit Commits Preview",
-				-- 	},
-				-- 	["n <leader>gcl"] = {
-				-- 		function()
-				-- 			require("vgit").project_logs_preview()
-				-- 		end,
-				-- 		desc = "VGit Logs Preview",
-				-- 	},
-				-- 	["n <leader>gd"] = {
-				-- 		function()
-				-- 			require("vgit").project_diff_preview()
-				-- 		end,
-				-- 		desc = "VGit Project Diff",
-				-- 	},
-				-- 	["n <leader>gx"] = {
-				-- 		function()
-				-- 			require("vgit").toggle_diff_preference()
-				-- 		end,
-				-- 		desc = "VGit Toggle Diff Preference",
-				-- 	},
-				-- },
-			)
-		end,
-
-		vim.keymap.set("n", "<C-k>", function()
-			require("vgit").hunk_up()
-		end, { desc = "VGit Hunk Up" }),
-
-		vim.keymap.set("n", "<C-j>", function()
-			require("vgit").hunk_down()
-		end, { desc = "VGit Hunk Down" }),
-
-		vim.keymap.set("n", "<leader>gs", function()
-			require("vgit").buffer_hunk_stage()
-		end, { desc = "VGit Stage Hunk" }),
-
-		vim.keymap.set("n", "<leader>gr", function()
-			require("vgit").buffer_hunk_reset()
-		end, { desc = "VGit Reset Hunk" }),
-
-		vim.keymap.set("n", "<leader>gp", function()
-			require("vgit").buffer_hunk_preview()
-		end, { desc = "VGit Preview Hunk" }),
-
-		vim.keymap.set("n", "<leader>gb", function()
-			require("vgit").buffer_blame_preview()
-		end, { desc = "VGit Blame Preview" }),
-
-		vim.keymap.set("n", "<leader>gf", function()
-			require("vgit").buffer_diff_preview()
-		end, { desc = "VGit Diff Preview" }),
-
-		vim.keymap.set("n", "<leader>gh", function()
-			require("vgit").buffer_history_preview()
-		end, { desc = "VGit History Preview" }),
-
-		vim.keymap.set("n", "<leader>gu", function()
-			require("vgit").buffer_reset()
-		end, { desc = "VGit Reset Buffer" }),
-
-		vim.keymap.set("n", "<leader>gcm", function()
-			require("vgit").project_commit_preview()
-		end, { desc = "VGit Commit Preview" }),
-
-		vim.keymap.set("n", "<leader>gcc", function()
-			require("vgit").project_commits_preview()
-		end, { desc = "VGit Commits Preview" }),
-
-		vim.keymap.set("n", "<leader>gcl", function()
-			require("vgit").project_logs_preview()
-		end, { desc = "VGit Logs Preview" }),
-
-		vim.keymap.set("n", "<leader>gd", function()
-			require("vgit").project_diff_preview()
-		end, { desc = "VGit Project Diff" }),
-
-		vim.keymap.set("n", "<leader>gx", function()
-			require("vgit").toggle_diff_preference()
-		end, { desc = "VGit Toggle Diff Preference" }),
+		"sindrets/diffview.nvim",
+		opts = {},
+		vim.keymap.set("n", "<leader>gd", "<CMD>DiffviewOpen<CR>", { desc = "Git DiffviewOpen" }),
+		vim.keymap.set("n", "<leader>gc", "<CMD>DiffviewClose<CR>", { desc = "Git DiffviewClose" }),
 	},
+	-- {
+	-- 	"tanvirtin/vgit.nvim",
+	-- 	dependencies = { "nvim-lua/plenary.nvim", "nvim-tree/nvim-web-devicons" },
+	-- 	-- Lazy loading on 'VimEnter' event is necessary.
+	-- 	event = "VimEnter",
+	-- 	config = function()
+	-- 		require("vgit").setup(
+	-- 			-- keymaps = {
+	-- 			-- 	["n <C-k>"] = {
+	-- 			-- 		function()
+	-- 			-- 			require("vgit").hunk_up()
+	-- 			-- 		end,
+	-- 			-- 		desc = "VGit Hunk Up",
+	-- 			-- 	},
+	-- 			-- 	["n <C-j>"] = {
+	-- 			-- 		function()
+	-- 			-- 			require("vgit").hunk_down()
+	-- 			-- 		end,
+	-- 			-- 		desc = "VGit Hunk Down",
+	-- 			-- 	},
+	-- 			-- 	["n <leader>gs"] = {
+	-- 			-- 		function()
+	-- 			-- 			require("vgit").buffer_hunk_stage()
+	-- 			-- 		end,
+	-- 			-- 		desc = "VGit Stage Hunk",
+	-- 			-- 	},
+	-- 			-- 	["n <leader>gr"] = {
+	-- 			-- 		function()
+	-- 			-- 			require("vgit").buffer_hunk_reset()
+	-- 			-- 		end,
+	-- 			-- 		desc = "VGit Reset Hunk",
+	-- 			-- 	},
+	-- 			-- 	["n <leader>gp"] = {
+	-- 			-- 		function()
+	-- 			-- 			require("vgit").buffer_hunk_preview()
+	-- 			-- 		end,
+	-- 			-- 		desc = "VGit Preview Hunk",
+	-- 			-- 	},
+	-- 			-- 	["n <leader>gb"] = {
+	-- 			-- 		function()
+	-- 			-- 			require("vgit").buffer_blame_preview()
+	-- 			-- 		end,
+	-- 			-- 		desc = "VGit Blame Preview",
+	-- 			-- 	},
+	-- 			-- 	["n <leader>gf"] = {
+	-- 			-- 		function()
+	-- 			-- 			require("vgit").buffer_diff_preview()
+	-- 			-- 		end,
+	-- 			-- 		desc = "VGit Diff Preview",
+	-- 			-- 	},
+	-- 			-- 	["n <leader>gh"] = {
+	-- 			-- 		function()
+	-- 			-- 			require("vgit").buffer_history_preview()
+	-- 			-- 		end,
+	-- 			-- 		desc = "VGit History Preview",
+	-- 			-- 	},
+	-- 			-- 	["n <leader>gu"] = {
+	-- 			-- 		function()
+	-- 			-- 			require("vgit").buffer_reset()
+	-- 			-- 		end,
+	-- 			-- 		desc = "VGit Reset Buffer",
+	-- 			-- 	},
+	-- 			-- 	["n <leader>gcm"] = {
+	-- 			-- 		function()
+	-- 			-- 			require("vgit").project_commit_preview()
+	-- 			-- 		end,
+	-- 			-- 		desc = "VGit Commit Preview",
+	-- 			-- 	},
+	-- 			-- 	["n <leader>gcc"] = {
+	-- 			-- 		function()
+	-- 			-- 			require("vgit").project_commits_preview()
+	-- 			-- 		end,
+	-- 			-- 		desc = "VGit Commits Preview",
+	-- 			-- 	},
+	-- 			-- 	["n <leader>gcl"] = {
+	-- 			-- 		function()
+	-- 			-- 			require("vgit").project_logs_preview()
+	-- 			-- 		end,
+	-- 			-- 		desc = "VGit Logs Preview",
+	-- 			-- 	},
+	-- 			-- 	["n <leader>gd"] = {
+	-- 			-- 		function()
+	-- 			-- 			require("vgit").project_diff_preview()
+	-- 			-- 		end,
+	-- 			-- 		desc = "VGit Project Diff",
+	-- 			-- 	},
+	-- 			-- 	["n <leader>gx"] = {
+	-- 			-- 		function()
+	-- 			-- 			require("vgit").toggle_diff_preference()
+	-- 			-- 		end,
+	-- 			-- 		desc = "VGit Toggle Diff Preference",
+	-- 			-- 	},
+	-- 			-- },
+	-- 		)
+	-- 	end,
+	--
+	-- 	vim.keymap.set("n", "<C-k>", function()
+	-- 		require("vgit").hunk_up()
+	-- 	end, { desc = "VGit Hunk Up" }),
+	--
+	-- 	vim.keymap.set("n", "<C-j>", function()
+	-- 		require("vgit").hunk_down()
+	-- 	end, { desc = "VGit Hunk Down" }),
+	--
+	-- 	vim.keymap.set("n", "<leader>gs", function()
+	-- 		require("vgit").buffer_hunk_stage()
+	-- 	end, { desc = "VGit Stage Hunk" }),
+	--
+	-- 	vim.keymap.set("n", "<leader>gr", function()
+	-- 		require("vgit").buffer_hunk_reset()
+	-- 	end, { desc = "VGit Reset Hunk" }),
+	--
+	-- 	vim.keymap.set("n", "<leader>gp", function()
+	-- 		require("vgit").buffer_hunk_preview()
+	-- 	end, { desc = "VGit Preview Hunk" }),
+	--
+	-- 	vim.keymap.set("n", "<leader>gb", function()
+	-- 		require("vgit").buffer_blame_preview()
+	-- 	end, { desc = "VGit Blame Preview" }),
+	--
+	-- 	vim.keymap.set("n", "<leader>gf", function()
+	-- 		require("vgit").buffer_diff_preview()
+	-- 	end, { desc = "VGit Diff Preview" }),
+	--
+	-- 	vim.keymap.set("n", "<leader>gh", function()
+	-- 		require("vgit").buffer_history_preview()
+	-- 	end, { desc = "VGit History Preview" }),
+	--
+	-- 	vim.keymap.set("n", "<leader>gu", function()
+	-- 		require("vgit").buffer_reset()
+	-- 	end, { desc = "VGit Reset Buffer" }),
+	--
+	-- 	vim.keymap.set("n", "<leader>gcm", function()
+	-- 		require("vgit").project_commit_preview()
+	-- 	end, { desc = "VGit Commit Preview" }),
+	--
+	-- 	vim.keymap.set("n", "<leader>gcc", function()
+	-- 		require("vgit").project_commits_preview()
+	-- 	end, { desc = "VGit Commits Preview" }),
+	--
+	-- 	vim.keymap.set("n", "<leader>gcl", function()
+	-- 		require("vgit").project_logs_preview()
+	-- 	end, { desc = "VGit Logs Preview" }),
+	--
+	-- 	vim.keymap.set("n", "<leader>gd", function()
+	-- 		require("vgit").project_diff_preview()
+	-- 	end, { desc = "VGit Project Diff" }),
+	--
+	-- 	vim.keymap.set("n", "<leader>gx", function()
+	-- 		require("vgit").toggle_diff_preference()
+	-- 	end, { desc = "VGit Toggle Diff Preference" }),
+	-- },
 
 	{
 		"lewis6991/gitsigns.nvim",