diff --git a/nvim/cheatsheet.txt b/nvim/cheatsheet.txt
index 3a16fab..1ecdfdf 100644
--- a/nvim/cheatsheet.txt
+++ b/nvim/cheatsheet.txt
@@ -1 +1,6 @@
+## Telescope @custom:
 Search, Preview and Open file | <leader>ff
+
+## Formatter @custom:
+Format current buffer | <leader>f
+Format and write current buffer | <leader>F
diff --git a/nvim/init.vim b/nvim/init.vim
index 4a163f0..05eb79b 100644
--- a/nvim/init.vim
+++ b/nvim/init.vim
@@ -16,4 +16,6 @@ augroup FormatAutogroup
   autocmd BufWritePost * FormatWrite
 augroup END
 
+so "keybinding.vim"
+
 lua require('plugins')
diff --git a/nvim/keybinding.vim b/nvim/keybinding.vim
new file mode 100644
index 0000000..b7348b8
--- /dev/null
+++ b/nvim/keybinding.vim
@@ -0,0 +1,2 @@
+nnoremap <silent> <leader>f :Format<CR>
+nnoremap <silent> <leader>F :FormatWrite<CR>
diff --git a/nvim/lua/barbar-config.lua b/nvim/lua/barbar-config.lua
new file mode 100644
index 0000000..11c04e1
--- /dev/null
+++ b/nvim/lua/barbar-config.lua
@@ -0,0 +1,16 @@
+local map = vim.api.nvim_set_keymap
+local opts = { noremap = true, silent = true }
+
+-- Move to previous/next
+map('n', '<A-,>', '<Cmd>BufferPrevious<CR>', opts)
+-- Goto buffer in position...
+map('n', '<A-1>', '<Cmd>BufferGoto 1<CR>', opts)
+map('n', '<A-2>', '<Cmd>BufferGoto 2<CR>', opts)
+map('n', '<A-3>', '<Cmd>BufferGoto 3<CR>', opts)
+map('n', '<A-4>', '<Cmd>BufferGoto 4<CR>', opts)
+map('n', '<A-5>', '<Cmd>BufferGoto 5<CR>', opts)
+map('n', '<A-6>', '<Cmd>BufferGoto 6<CR>', opts)
+map('n', '<A-7>', '<Cmd>BufferGoto 7<CR>', opts)
+map('n', '<A-8>', '<Cmd>BufferGoto 8<CR>', opts)
+map('n', '<A-9>', '<Cmd>BufferGoto 9<CR>', opts)
+map('n', '<A-0>', '<Cmd>BufferLast<CR>', opts)
diff --git a/nvim/lua/plugins.lua b/nvim/lua/plugins.lua
index 7de08d6..a0ee9aa 100644
--- a/nvim/lua/plugins.lua
+++ b/nvim/lua/plugins.lua
@@ -28,7 +28,10 @@ return require("packer").startup(function(use)
 		},
 	})
 
-	use({ "romgrk/barbar.nvim", requires = "nvim-web-devicons" })
+	use({
+		"romgrk/barbar.nvim",
+		requires = { "nvim-web-devicons", "lewis6991/gitsigns.nvim" },
+	})
 
 	use("nvim-treesitter/nvim-treesitter")
 
@@ -87,14 +90,15 @@ return require("packer").startup(function(use)
 	require("nvim-tree-config")
 	require("nvim-cmp-config")
 	require("autoclose-config")
-	require("image-config")
+    require("barbar-config")
+	--require("image-config")
 	require("telescope-config")
 	-- require('ale-config')
 	require("formatter-config")
 	require("lualine").setup()
 	require("virt-column").setup()
 
-	if packer_bootstrap then
+    if packer_bootstrap then
 		require("packer").sync()
 	end
 end)