diff --git a/config/nvim/lua/keymaps.lua b/config/nvim/lua/keymaps.lua
index 0e6bbe17..ba5fd83a 100644
--- a/config/nvim/lua/keymaps.lua
+++ b/config/nvim/lua/keymaps.lua
@@ -1,5 +1,5 @@
-vim.g.mapleader = " "
 vim.keymap.set("i", "jk", "<esc>")
+vim.keymap.set("n", "<leader>l", "<cmd>Lazy<CR>")
 vim.keymap.set({ "n", "t" }, "<A-h>", "<CMD>NavigatorLeft<CR>")
 vim.keymap.set({ "n", "t" }, "<A-l>", "<CMD>NavigatorRight<CR>")
 vim.keymap.set({ "n", "t" }, "<A-k>", "<CMD>NavigatorUp<CR>")
@@ -25,7 +25,7 @@ vim.keymap.set("n", "<leader>\\", "<cmd>Neotree reveal<cr>")
 
 -- diffview
 vim.keymap.set("n", "<leader>do", "<cmd>DiffviewOpen<cr>")
-vim.keymap.set("n", "<leader>dc", "<cmd>DiffviewOpen<cr>")
+vim.keymap.set("n", "<leader>dc", "<cmd>DiffviewClose<cr>")
 vim.keymap.set("n", "<leader>dh", "<cmd>DiffviewFileHistory<cr>")
 vim.keymap.set("n", "<leader>df", "<cmd>DiffviewFileHistory %<cr>")
 
diff --git a/config/nvim/lua/plugins/catppuccin.lua b/config/nvim/lua/plugins/catppuccin.lua
index 2e949279..e967a4cc 100644
--- a/config/nvim/lua/plugins/catppuccin.lua
+++ b/config/nvim/lua/plugins/catppuccin.lua
@@ -4,37 +4,8 @@ return {
     lazy = false,
     priority = 1000,
     config = function()
-        vim.opt.fillchars:append {
-            horiz = "━",
-            horizup = "┻",
-            horizdown = "┳",
-            vert = "┃",
-            vertleft = "┨",
-            vertright = "┣",
-            verthoriz = "╋",
-        }
-        require("catppuccin").setup {
-            flavour = "macchiato",
-            transparent_background = true,
-            term_colors = true,
-            integrations = {
-                gitsigns = true,
-                indent_blankline = {
-                    enabled = true,
-                    colored_indent_levels = true,
-                },
-                cmp = true,
-                native_lsp = {
-                    enabled = true,
-                },
-                notify = true,
-                nvimtree = true,
-                treesitter = true,
-                treesitter_context = true,
-                telescope = true,
-                lsp_trouble = true,
-            },
-        }
+        require "ui.fillchars"
+        require("catppuccin").setup ( require "ui.catppuccin_opts" )
         vim.cmd "colorscheme catppuccin"
     end,
 }
diff --git a/config/nvim/lua/plugins/diffview.lua b/config/nvim/lua/plugins/diffview.lua
index b4191821..23b7839c 100644
--- a/config/nvim/lua/plugins/diffview.lua
+++ b/config/nvim/lua/plugins/diffview.lua
@@ -1,6 +1,10 @@
 return {
     "sindrets/diffview.nvim",
     dependencies = { "nvim-lua/plenary.nvim", "nvim-tree/nvim-web-devicons" },
+    cmd = {
+        "DiffviewOpen",
+        "DiffviewFileHistory",
+    },
     config = function()
         require("diffview").setup {
             enhanced_diff_hl = true,
diff --git a/config/nvim/lua/plugins/feline.lua b/config/nvim/lua/plugins/feline.lua
index 1ebecc8c..6840c5d2 100644
--- a/config/nvim/lua/plugins/feline.lua
+++ b/config/nvim/lua/plugins/feline.lua
@@ -1,6 +1,6 @@
 return {
     "feline-nvim/feline.nvim",
-    dependencies = "catppuccin/nvim",
+    dependencies = { require "plugins.catppuccin" },
     config = function()
         local components = require("ui.catppuccin_feline").get()
         require("feline").setup { components = components }
diff --git a/config/nvim/lua/plugins/navigator.lua b/config/nvim/lua/plugins/navigator.lua
index d3ceb4e7..47e6bfb8 100644
--- a/config/nvim/lua/plugins/navigator.lua
+++ b/config/nvim/lua/plugins/navigator.lua
@@ -1,5 +1,4 @@
 return {
     "numToStr/Navigator.nvim",
-    name = "Navigator",
     config = function() require("Navigator").setup() end,
 }
diff --git a/config/nvim/lua/plugins/nvim-test.lua b/config/nvim/lua/plugins/nvim-test.lua
index 7b8782a3..dd828d2e 100644
--- a/config/nvim/lua/plugins/nvim-test.lua
+++ b/config/nvim/lua/plugins/nvim-test.lua
@@ -1,5 +1,14 @@
 return {
     "klen/nvim-test",
+    cmd = {
+        "TestSuite",
+        "TestFile",
+        "TestEdit",
+        "TestNearest",
+        "TestLast",
+        "TestVisit",
+        "TestInfo",
+    },
     config = function()
         require("nvim-test").setup {
             termOpts = {
diff --git a/config/nvim/lua/ui/catppuccin_opts.lua b/config/nvim/lua/ui/catppuccin_opts.lua
new file mode 100644
index 00000000..1e89be42
--- /dev/null
+++ b/config/nvim/lua/ui/catppuccin_opts.lua
@@ -0,0 +1,22 @@
+return {
+    flavour = "macchiato",
+    transparent_background = true,
+    term_colors = true,
+    integrations = {
+        gitsigns = true,
+        indent_blankline = {
+            enabled = true,
+            colored_indent_levels = true,
+        },
+        cmp = true,
+        native_lsp = {
+            enabled = true,
+        },
+        notify = true,
+        nvimtree = true,
+        treesitter = true,
+        treesitter_context = true,
+        telescope = true,
+        lsp_trouble = true,
+    },
+}
diff --git a/config/nvim/lua/ui/fillchars.lua b/config/nvim/lua/ui/fillchars.lua
new file mode 100644
index 00000000..61a2aa07
--- /dev/null
+++ b/config/nvim/lua/ui/fillchars.lua
@@ -0,0 +1,9 @@
+vim.opt.fillchars:append {
+    horiz = "━",
+    horizup = "┻",
+    horizdown = "┳",
+    vert = "┃",
+    vertleft = "┨",
+    vertright = "┣",
+    verthoriz = "╋",
+}