diff --git a/lua/core/default_config.lua b/lua/core/default_config.lua
index 0806907..474663c 100644
--- a/lua/core/default_config.lua
+++ b/lua/core/default_config.lua
@@ -34,7 +34,7 @@ M.ui = {
     theme = "default", -- default/vscode/vscode_colored/minimal
     -- default/round/block/arrow separators work only for default statusline theme
     -- round and block will work for minimal theme only
-    separator_style = "arrow",
+    separator_style = "block",
     overriden_modules = nil,
   },
 
diff --git a/lua/custom/chadrc.lua b/lua/custom/chadrc.lua
index b997e1f..884e186 100644
--- a/lua/custom/chadrc.lua
+++ b/lua/custom/chadrc.lua
@@ -5,8 +5,8 @@ local M = {}
 local highlights = require "custom.highlights"
 
 M.ui = {
-  theme = "chadtain",
-  theme_toggle = { "chadtain", "one_light" },
+  theme = "pastelDark",
+  theme_toggle = { "pastelDark", "one_light" },
 
   hl_override = highlights.override,
   hl_add = highlights.add,
diff --git a/lua/custom/init.lua b/lua/custom/init.lua
index d44d34e..7bd2a96 100644
--- a/lua/custom/init.lua
+++ b/lua/custom/init.lua
@@ -9,3 +9,4 @@
 local opt = vim.opt
 
 opt.laststatus = 3
+opt.swapfile = false
diff --git a/lua/custom/mappings.lua b/lua/custom/mappings.lua
index 67161dd..3f58b3f 100644
--- a/lua/custom/mappings.lua
+++ b/lua/custom/mappings.lua
@@ -18,7 +18,7 @@ M.general = {
     ["<leader>ws"] = { "<C-w>s", "Split horizontal" },
     ["<leader>wo"] = { "<C-w>o", "Maximize split" },
     ["<leader>wc"] = { "<C-w>c", "Close split" },
-    ["<leader>w="] = { "w=", "Even splits" },
+    ["<leader>w="] = { "<C-w>=", "Even splits" },
     ["<leader>h"] = { "<C-w>h", "Focus left split" },
     ["<leader>j"] = { "<C-w>j", "Focus lower split" },
     ["<leader>k"] = { "<C-w>k", "Focus upper split" },
@@ -32,21 +32,40 @@ M.general = {
     [",,"] = { ":w<CR>", "save" },
     ["<leader> "] = { ":w<CR>", "save" },
 
-    [",z"] = { ":bnext<CR>", "Next buffer" },
-    [",v"] = { ":bprevious<CR>", "Previous buffer" },
-    ["<leader>z"] = { ":bnext<CR>", "Next buffer" },
-    ["<leader>v"] = { ":bprevious<CR>", "Previous buffer" },
-
     ["<leader>n"] = { "<cmd> NvimTreeToggle <CR>", "Toggle nvimtree" },
     ["<leader>N"] = { "<cmd> set nu! <CR>", "Toggle line number" },
 
-    ["<leader>c"] = { "<cmd>bdelete<CR>", "Close Buffer" },
+    ["<leader>c"] = { "<cmd>Bdelete<CR>", "Close Buffer" },
     ["<leader>b"] = { "<cmd> Telescope buffers <CR>", "Find buffers" },
 
     -- ["<A-Space>"] = cmp.mapping.complete(),
 
-    ["gu"] = { "<cmd>diffget //2<CR>", "Select left in conflict"},
-    ["gh"] = { "<cmd>diffget //3<CR>", "Select right in conflict"},
+    ["gu"] = { "<cmd>diffget //2<CR>", "Select left in conflict" },
+    ["gh"] = { "<cmd>diffget //3<CR>", "Select right in conflict" },
+
+    ["gl"] = {
+      function()
+        vim.diagnostic.open_float { border = "rounded" }
+      end,
+      "Floating diagnostic",
+    },
+
+    [",z"] = { ":bnext<CR>", "Next buffer" },
+    [",v"] = { ":bprevious<CR>", "Previous buffer" },
+
+    ["<leader>z"] = {
+      function()
+        require("nvchad.tabufline").tabuflineNext()
+      end,
+      "Goto next buffer",
+    },
+
+    ["<leader>v"] = {
+      function()
+        require("nvchad.tabufline").tabuflinePrev()
+      end,
+      "Goto prev buffer",
+    },
   },
   v = {
     [">"] = { ">gv", "indent" },
diff --git a/lua/custom/plugins.lua b/lua/custom/plugins.lua
index 96336cd..3623ada 100644
--- a/lua/custom/plugins.lua
+++ b/lua/custom/plugins.lua
@@ -134,13 +134,20 @@ local plugins = {
 
   { "tpope/vim-surround", lazy = false },
 
-  { "tpope/vim-fugitive" },
+  { "famiu/bufdelete.nvim", lazy = false },
+
+  -- { "tpope/vim-fugitive", lazy = false },
 
   {
     "lukas-reineke/indent-blankline.nvim",
     enabled = false,
   },
 
+  {
+    "lewis6991/gitsigns.nvim",
+    enabled = false,
+  },
+
   -- To make a plugin not be loaded
   -- {
   --   "NvChad/nvim-colorizer.lua",