diff --git a/lua/chadrc.lua b/lua/chadrc.lua
index 4fea792..23d94dc 100644
--- a/lua/chadrc.lua
+++ b/lua/chadrc.lua
@@ -1,131 +1,141 @@
-local M = {
-   ui = {
-      theme = "onedark",
-      fav_themes = { "onedark", "gruvchad" }, -- for theme toggle
-      theme_toggler = false,
-      hidden_statusline = {
-         -- these are filetypes, not pattern matched
-         "NvimTree",
-         "toggleterm",
-      },
+local M = {}
+
+M.ui = {
+   theme = "onedark",
+   -- for theme toggle
+   fav_themes = {
+      "onedark",
+      "gruvchad",
    },
-   options = {
-      permanent_undo = true,
-      ruler = false,
-      hidden = true,
-      ignorecase = true,
-      mouse = "a",
-      cmdheight = 1,
-      updatetime = 250,
-      timeoutlen = 400,
-      clipboard = "unnamedplus",
-      number = true,
-      numberwidth = 2,
-      expandtab = true,
-      shiftwidth = 2,
-      smartindent = true,
-      mapleader = " ",
-      autosave = false,
-      enable_insertNav = true, -- navigation in insertmode
+   theme_toggler = false,
+   hidden_statusline = {
+      -- these are filetypes, not pattern matched
+      "NvimTree",
+      "toggleterm",
    },
-   -- enable and disable plugins (true for disable)
-   plugin_status = {
-      -- UI
-      nvim_bufferline = true,
-      galaxyline = true,
-      nvim_colorizer = true,
-      dashboard_nvim = true,
-      blankline = true,
-      truezen_nvim = true,
-      better_esc = true,
-      -- lsp stuff
-      lspkind = true,
-      lspsignature = true,
-      -- git stuff
-      gitsigns = true,
-      vim_fugitive = true,
-      -- misc
-      neoformat = true,
-      vim_matchup = true,
-      autosave_nvim = true,
-      nvim_comment = true,
-      neoscroll_nvim = true,
-      telescope_media = true,
-      cheatsheet = false,
+}
+
+M.options = {
+   permanent_undo = true,
+   ruler = false,
+   hidden = true,
+   ignorecase = true,
+   mouse = "a",
+   cmdheight = 1,
+   updatetime = 250,
+   timeoutlen = 400,
+   clipboard = "unnamedplus",
+   number = true,
+   numberwidth = 2,
+   expandtab = true,
+   shiftwidth = 2,
+   smartindent = true,
+   mapleader = " ",
+   autosave = false,
+   enable_insertNav = true, -- navigation in insertmode
+}
+
+-- enable and disable plugins (false for disable)
+M.plugin_status = {
+   -- UI
+   nvim_bufferline = true,
+   galaxyline = true,
+   nvim_colorizer = true,
+   dashboard_nvim = true,
+   blankline = true,
+   truezen_nvim = true,
+   better_esc = true,
+   -- lsp stuff
+   lspkind = true,
+   lspsignature = true,
+   -- git stuff
+   gitsigns = true,
+   vim_fugitive = true,
+   -- misc
+   neoformat = true,
+   vim_matchup = true,
+   autosave_nvim = true,
+   nvim_comment = true,
+   neoscroll_nvim = true,
+   telescope_media = true,
+   cheatsheet = false,
+}
+
+-- make sure you dont use same keys twice
+M.mappings = {
+   -- plugin specific
+   truezen = {
+      ataraxisMode = "<leader>zz",
+      minimalisticmode = "<leader>zm",
+      focusmode = "<leader>zf",
    },
-   -- make sure you dont use same keys twice
-   mappings = {
-      truezen = {
-         ataraxisMode = "<leader>zz",
-         minimalisticmode = "<leader>zm",
-         focusmode = "<leader>zf",
-      },
-      comment_nvim = {
-         comment_toggle = "<leader>/",
-      },
-      nvimtree = {
-         treetoggle = "<C-n>",
-      },
-      neoformat = {
-         format = "<leader>fm",
-      },
-      dashboard = {
-         open = "<leader>db",
-         newfile = "<leader>fn",
-         bookmarks = "<leader>bm",
-         sessionload = "<leader>l",
-         sessionsave = "<leader>s",
-      },
-      telescope = {
-         live_grep = "<leader>fw",
-         git_status = "<leader>gt",
-         git_commits = "<leader>cm",
-         find_files = "<leader>ff",
-         buffers = "<leader>fb",
-         help_tags = "<leader>fh",
-         oldfiles = "<leader>fo",
-         themes = "<leader>th",
-      },
-      telescope_media = {
-         media_files = "<leader>fp",
-      },
-      chadsheet = {
-         default_keys = "<leader>dk",
-         user_keys = "<leader>uk",
-      },
-      bufferline = {
-         new_buffer = "<S-t>",
-         newtab = "<C-t>b",
-         close = "<S-x>",
-         cycleNext = "<TAB>",
-         cyclePrev = "<S-Tab>",
-      },
-      fugitive = {
-         Git = "<leader>gs",
-         diffget_2 = "<leader>gh",
-         diffget_3 = "<leader>gl",
-         git_blame = "<leader>gb",
-      },
-      toggleterm = {
-         toggle_window = "<leader>w",
-         toggle_vert = "<leader>v",
-         toggle_hori = "<leader>h",
-         hide_term = "JK",
-      },
-      insert_nav = {
-         forward = "<C-l>",
-         backward = "<C-h>",
-         top_of_line = "<C-a>",
-         end_of_line = "<C-e>",
-         prev_line = "<C-j>",
-         next_line = "<C-k>",
-      },
-      misc = {
-         esc_Termmode = "jk",
-         copywhole_file = "<C-a>",
-         toggle_linenr = "<leader>n",
-         theme_toggle = "<leader>x",
-      },
+   comment_nvim = {
+      comment_toggle = "<leader>/",
+   },
+   nvimtree = {
+      treetoggle = "<C-n>", -- file manager
+   },
+   neoformat = {
+      format = "<leader>fm",
+   },
+   dashboard = {
+      open = "<leader>db",
+      newfile = "<leader>fn",
+      bookmarks = "<leader>bm",
+      sessionload = "<leader>l",
+      sessionsave = "<leader>s",
+   },
+   telescope = {
+      live_grep = "<leader>fw",
+      git_status = "<leader>gt",
+      git_commits = "<leader>cm",
+      find_files = "<leader>ff",
+      buffers = "<leader>fb",
+      help_tags = "<leader>fh",
+      oldfiles = "<leader>fo",
+      themes = "<leader>th",
+   },
+   telescope_media = {
+      media_files = "<leader>fp",
+   },
+   chadsheet = {
+      default_keys = "<leader>dk",
+      user_keys = "<leader>uk",
+   },
+   bufferline = {
+      new_buffer = "<S-t>",
+      newtab = "<C-t>b",
+      cycleNext = "<TAB>", -- next buffer
+      cyclePrev = "<S-Tab>", -- previous buffer
+   },
+   fugitive = {
+      Git = "<leader>gs",
+      diffget_2 = "<leader>gh",
+      diffget_3 = "<leader>gl",
+      git_blame = "<leader>gb",
+   },
+   toggleterm = {
+      toggle_window = "<leader>w",
+      toggle_vert = "<leader>v",
+      toggle_hori = "<leader>h",
+      hide_term = "JK",
+   },
+   -- navigation in insert mode
+   insert_nav = {
+      forward = "<C-l>",
+      backward = "<C-h>",
+      top_of_line = "<C-a>",
+      end_of_line = "<C-e>",
+      prev_line = "<C-j>",
+      next_line = "<C-k>",
+   },
+   -- non plugin
+   misc = {
+      esc_Termmode = "jk", -- get out of terminal mode
+      close_buffer = "<S-x>", -- close current focused buffer
+      copywhole_file = "<C-a>",
+      toggle_linenr = "<leader>n", -- show or hide line number
+      theme_toggle = "<leader>x",
    },
 }
 
diff --git a/lua/mappings.lua b/lua/mappings.lua
index 7630dcd..ecd02d8 100644
--- a/lua/mappings.lua
+++ b/lua/mappings.lua
@@ -45,6 +45,10 @@ map("n", miscMap.toggle_linenr, ":set nu!<CR>", opt)
 -- get out of terminal with jk
 map("t", miscMap.esc_Termmode, "<C-\\><C-n>", opt)
 
+-- close current focused buffer, terminal or normal
+-- todo: don't close if non-terminal buffer is saved
+map("n", miscMap.close_buffer, ":bd!<CR>", opt)
+
 M.toggleterm = function()
    local m = user_map.toggleterm
 
@@ -131,7 +135,6 @@ M.bufferline = function()
 
    map("n", m.new_buffer, ":enew<CR>", opt) -- new buffer
    map("n", m.newtab, ":tabnew<CR>", opt) -- new tab
-   map("n", m.close, ":bd!<CR>", opt) -- close  buffer
 
    -- move between tabs
 
diff --git a/lua/themes/chadracula.lua b/lua/themes/chadracula.lua
index 236de87..1cd6146 100644
--- a/lua/themes/chadracula.lua
+++ b/lua/themes/chadracula.lua
@@ -29,7 +29,7 @@ local colors = {
    lightbg = "#343642",
    lightbg2 = "#2f313d",
    pmenu_bg = "#b389ef",
-   folder_bg = "#BD93F9"
+   folder_bg = "#BD93F9",
 }
 
 return colors
diff --git a/lua/themes/everforest.lua b/lua/themes/everforest.lua
index baa715a..da9f59f 100644
--- a/lua/themes/everforest.lua
+++ b/lua/themes/everforest.lua
@@ -29,7 +29,7 @@ local colors = {
    lightbg = "#3d454b",
    lightbg2 = "#333b41",
    pmenu_bg = "#83c092",
-   folder_bg = "#7fbbb3"
+   folder_bg = "#7fbbb3",
 }
 
 return colors
diff --git a/lua/themes/gruvchad.lua b/lua/themes/gruvchad.lua
index 37a88fd..c7b174f 100644
--- a/lua/themes/gruvchad.lua
+++ b/lua/themes/gruvchad.lua
@@ -29,7 +29,7 @@ local colors = {
    lightbg = "#2d3139",
    lightbg2 = "#262a32",
    pmenu_bg = "#89b482",
-   folder_bg = "#6d8dad"
+   folder_bg = "#6d8dad",
 }
 
 return colors
diff --git a/lua/themes/mountain.lua b/lua/themes/mountain.lua
index f26d227..9bf5989 100644
--- a/lua/themes/mountain.lua
+++ b/lua/themes/mountain.lua
@@ -29,7 +29,7 @@ local colors = {
    lightbg = "#2d3339",
    lightbg2 = "#252b31",
    pmenu_bg = "#8aac8b",
-   folder_bg = "#6b8bab"
+   folder_bg = "#6b8bab",
 }
 
 return colors
diff --git a/lua/themes/norchad.lua b/lua/themes/norchad.lua
index a1a6a53..01b6e52 100644
--- a/lua/themes/norchad.lua
+++ b/lua/themes/norchad.lua
@@ -29,7 +29,7 @@ local colors = {
    lightbg = "#3f4551",
    lightbg2 = "#393f4b",
    pmenu_bg = "#A3BE8C",
-   folder_bg = "#7797b7"
+   folder_bg = "#7797b7",
 }
 
 return colors
diff --git a/lua/themes/one-light.lua b/lua/themes/one-light.lua
index d287dfd..683d69a 100644
--- a/lua/themes/one-light.lua
+++ b/lua/themes/one-light.lua
@@ -29,7 +29,7 @@ local colors = {
    lightbg = "#d6d6d6",
    lightbg2 = "#5e5f65",
    pmenu_bg = "#5e5f65",
-   folder_bg = "#6C6C6C"
+   folder_bg = "#6C6C6C",
 }
 
 return colors
diff --git a/lua/themes/onedark.lua b/lua/themes/onedark.lua
index ec8980d..2ff66aa 100644
--- a/lua/themes/onedark.lua
+++ b/lua/themes/onedark.lua
@@ -29,7 +29,7 @@ local colors = {
    lightbg = "#2d3139",
    lightbg2 = "#262a32",
    pmenu_bg = "#A3BE8C",
-   folder_bg = "#61afef"
+   folder_bg = "#61afef",
 }
 
 return colors
diff --git a/lua/themes/tokyonight.lua b/lua/themes/tokyonight.lua
index 5296414..5f7df4b 100644
--- a/lua/themes/tokyonight.lua
+++ b/lua/themes/tokyonight.lua
@@ -29,7 +29,7 @@ local colors = {
    lightbg = "#252631",
    lightbg2 = "#22232e",
    pmenu_bg = "#7aa2f7",
-   folder_bg = "#7aa2f7"
+   folder_bg = "#7aa2f7",
 }
 
 return colors
diff --git a/lua/themes/tomorrow-night.lua b/lua/themes/tomorrow-night.lua
index 2598533..01c78b6 100644
--- a/lua/themes/tomorrow-night.lua
+++ b/lua/themes/tomorrow-night.lua
@@ -29,7 +29,7 @@ local colors = {
    lightbg = "#373B41",
    lightbg2 = "#2D3035",
    pmenu_bg = "#a4b595",
-   folder_bg = "#6f8dab"
+   folder_bg = "#6f8dab",
 }
 
 return colors