diff --git a/after/plugin/bufdelete.lua b/after/plugin/bufdelete.lua
new file mode 100644
index 00000000..d3f7a26d
--- /dev/null
+++ b/after/plugin/bufdelete.lua
@@ -0,0 +1 @@
+vim.keymap.set("n", "<S-q>", "<cmd>Bdelete<CR>")
diff --git a/after/plugin/bufferline.lua b/after/plugin/bufferline.lua
new file mode 100644
index 00000000..b38afa4c
--- /dev/null
+++ b/after/plugin/bufferline.lua
@@ -0,0 +1,18 @@
+-- Keymaps
+
+local opts = { silent = true, noremap = true }
+
+vim.keymap.set('n', '<C-PageDown>', ':BufferLineCycleNext<CR>', opts)
+vim.keymap.set('n', '<C-PageUp>', ':BufferLineCyclePrev<CR>', opts)
+vim.keymap.set('n', '<leader>]', ':BufferLineCycleNext<CR>', opts)
+vim.keymap.set('n', '<leader>[', ':BufferLineCycleNext<CR>', opts)
+
+vim.keymap.set('n', '<C-S-PageDown>', ':BufferLineMoveNext<CR>', opts)
+vim.keymap.set('n', '<C-S-PageUp>', ':BufferLineMovePrev<CR>', opts)
+vim.keymap.set('n', '<leader>}', ':BufferLineMoveNext<CR>', opts)
+vim.keymap.set('n', '<leader>{', ':BufferLineMovePrev<CR>', opts)
+
+for i = 1, 9, 1 do
+    vim.keymap.set('n', '<leader>' .. i, '<cmd>BufferLineGoToBuffer ' .. i .. '<CR>', opts)
+end
+vim.keymap.set('n', '<leader>$', '<cmd>BufferLineGoToBuffer -1<CR>', opts)
diff --git a/after/plugin/filetree.lua b/after/plugin/filetree.lua
new file mode 100644
index 00000000..e66b779f
--- /dev/null
+++ b/after/plugin/filetree.lua
@@ -0,0 +1,4 @@
+-- Keymaps
+
+vim.keymap.set('n', '<leader>ef', ':Neotree source=filesystem reveal=true toggle<cr>')
+vim.keymap.set('n', '<leader>eb', ':Neotree source=buffers reveal=true toggle<cr>')
diff --git a/after/plugin/harpoon.lua b/after/plugin/harpoon.lua
new file mode 100644
index 00000000..18b89697
--- /dev/null
+++ b/after/plugin/harpoon.lua
@@ -0,0 +1,5 @@
+local mark = require("harpoon.mark")
+local ui = require("harpoon.ui")
+
+vim.keymap.set("n", "<leader>ha", mark.add_file, { desc = "Harpoon: add file" })
+vim.keymap.set("n", "<leader>hf", ui.toggle_quick_menu, { desc = "Harpoon: toggle quick menu" })
diff --git a/after/plugin/lualine.lua b/after/plugin/lualine.lua
new file mode 100644
index 00000000..2ddd670a
--- /dev/null
+++ b/after/plugin/lualine.lua
@@ -0,0 +1,11 @@
+require('lualine').setup {
+    options = {
+        theme = 'tokyonight',
+    },
+    extensions = {
+        'toggleterm',
+        'trouble',
+        'neo-tree',
+        'nvim-dap-ui',
+    },
+}
diff --git a/after/plugin/remap.lua b/after/plugin/remap.lua
new file mode 100644
index 00000000..f5831393
--- /dev/null
+++ b/after/plugin/remap.lua
@@ -0,0 +1,42 @@
+vim.keymap.set("n", "<leader>pv", vim.cmd.Ex)
+
+vim.keymap.set("v", "J", ":m '>+1<CR>gv=gv")
+vim.keymap.set("v", "K", ":m '<-2<CR>gv=gv")
+
+vim.keymap.set("n", "J", "mzJ`z")
+vim.keymap.set("n", "<C-d>", "<C-d>zz")
+vim.keymap.set("n", "<C-u>", "<C-u>zz")
+vim.keymap.set("n", "<PageDown>", "<C-d>zz")
+vim.keymap.set("n", "<PageUp>", "<C-u>zz")
+vim.keymap.set("n", "{", "{zz")
+vim.keymap.set("n", "}", "}zz")
+vim.keymap.set("n", "n", "nzzzv")
+vim.keymap.set("n", "N", "Nzzzv")
+
+vim.keymap.set("n", "<Home>", "_")
+vim.keymap.set("n", "<End>", "$")
+
+vim.keymap.set("x", "<leader>p", [["_dP]])
+
+vim.keymap.set({ "n", "v" }, "<leader>y", [["+y]])
+vim.keymap.set("n", "<leader>Y", [["+Y]])
+
+vim.keymap.set({ "n", "v" }, "<leader>d", [["_d]])
+
+vim.keymap.set("i", "<C-c>", "<Esc>")
+
+-- vim.keymap.set("n", "Q", "<nop>")
+vim.keymap.set("n", "<leader>f", vim.lsp.buf.format)
+
+vim.keymap.set("n", "<C-k>", "<cmd>cnext<CR>zz")
+vim.keymap.set("n", "<C-j>", "<cmd>cprev<CR>zz")
+vim.keymap.set("n", "<leader>k", "<cmd>lnext<CR>zz")
+vim.keymap.set("n", "<leader>j", "<cmd>lprev<CR>zz")
+
+vim.keymap.set("n", "<leader>sr", [[:%s/\<<C-r><C-w>\>/<C-r><C-w>/gI<Left><Left><Left>]])
+vim.keymap.set("n", "<leader>x", "<cmd>!chmod +x %<CR>", { silent = true })
+
+vim.keymap.set("n", "<S-h>", vim.cmd.bprevious,
+    { silent = true, desc = "Go to previous buffer" })
+vim.keymap.set("n", "<S-l>", vim.cmd.bnext,
+    { silent = true, desc = "Go to previous buffer" })
diff --git a/after/plugin/set.lua b/after/plugin/set.lua
new file mode 100644
index 00000000..7ff2e30e
--- /dev/null
+++ b/after/plugin/set.lua
@@ -0,0 +1,21 @@
+-- Custom options
+
+vim.opt.shell = "zsh"
+
+vim.opt.relativenumber = true
+
+vim.opt.tabstop = 4
+vim.opt.softtabstop = 4
+vim.opt.shiftwidth = 4
+vim.opt.expandtab = true
+
+vim.opt.smartindent = true
+
+vim.opt.wrap = true
+
+vim.opt.incsearch = true
+
+vim.opt.scrolloff = 8
+vim.opt.isfname:append("@-@")
+
+vim.opt.colorcolumn = "80"
diff --git a/after/plugin/toggleterm.lua b/after/plugin/toggleterm.lua
new file mode 100644
index 00000000..b8b1226a
--- /dev/null
+++ b/after/plugin/toggleterm.lua
@@ -0,0 +1,6 @@
+local Terminal = require('toggleterm.terminal').Terminal
+local lazygit  = Terminal:new({ cmd = 'lazygit', hidden = true })
+
+vim.keymap.set('n', '<leader>g', function()
+    lazygit:toggle()
+end, { noremap = true, silent = true, desc = 'Toggle lazygit' })
diff --git a/after/plugin/trouble.lua b/after/plugin/trouble.lua
new file mode 100644
index 00000000..f80cc436
--- /dev/null
+++ b/after/plugin/trouble.lua
@@ -0,0 +1,30 @@
+vim.keymap.set("n", "<leader>xx", "<cmd>TroubleToggle<cr>",
+    { silent = true, noremap = true }
+)
+vim.keymap.set("n", "<leader>xw", "<cmd>TroubleToggle workspace_diagnostics<cr>",
+    { silent = true, noremap = true }
+)
+vim.keymap.set("n", "<leader>xd", "<cmd>TroubleToggle document_diagnostics<cr>",
+    { silent = true, noremap = true }
+)
+-- vim.keymap.set("n", "<leader>xl", "<cmd>TroubleToggle loclist<cr>",
+--   {silent = true, noremap = true}
+-- )
+vim.keymap.set("n", "<leader>xq", "<cmd>TroubleToggle quickfix<cr>",
+    { silent = true, noremap = true }
+)
+-- vim.keymap.set("n", "gR", "<cmd>TroubleToggle lsp_references<cr>",
+--   {silent = true, noremap = true}
+-- )
+
+local signs = {
+    Error = " ",
+    Warn = " ",
+    Hint = " ",
+    Info = " "
+}
+
+for type, icon in pairs(signs) do
+    local hl = "DiagnosticSign" .. type
+    vim.fn.sign_define(hl, { text = icon, texthl = hl, numhl = hl })
+end
diff --git a/after/plugin/undotree.lua b/after/plugin/undotree.lua
new file mode 100644
index 00000000..b6b9276a
--- /dev/null
+++ b/after/plugin/undotree.lua
@@ -0,0 +1 @@
+vim.keymap.set("n", "<leader>u", vim.cmd.UndotreeToggle)
diff --git a/after/plugin/zenmode.lua b/after/plugin/zenmode.lua
new file mode 100644
index 00000000..8683471a
--- /dev/null
+++ b/after/plugin/zenmode.lua
@@ -0,0 +1 @@
+vim.keymap.set("n", "<leader>zz", vim.cmd.ZenMode)