diff --git a/dot_config/nvim/init.lua b/dot_config/nvim/init.lua
index 9bfe58b..e0220b8 100644
--- a/dot_config/nvim/init.lua
+++ b/dot_config/nvim/init.lua
@@ -11,12 +11,13 @@ if not vim.loop.fs_stat(lazypath) then
 end
 vim.opt.runtimepath:prepend(lazypath)
 
-vim.g.mapleader = '<Space>'
-vim.g.maplocalleader = '<Space>'
+vim.g.mapleader = ' '
+vim.g.maplocalleader = ' '
 vim.g.loaded_netrwPlugin = true
 
 require('lazy').setup('configs.packages', {
   install = { colorscheme = { 'gruvbox' }, },
+  -- rtp = { disabled_plugins = { 'netrwPlugin' } },
 })
 
 require('configs.options').setup()
diff --git a/dot_config/nvim/lua/configs/packages/fterm.lua b/dot_config/nvim/lua/configs/packages/fterm.lua
index 3f2f536..db756b7 100644
--- a/dot_config/nvim/lua/configs/packages/fterm.lua
+++ b/dot_config/nvim/lua/configs/packages/fterm.lua
@@ -10,10 +10,10 @@ local M = {
 function M.config()
 
   local fterm = require('FTerm')
-  fterm.scratch({
+
+  local lazygit = fterm:new({
     -- ft = 'fterm_lazygit', -- You can also override the default filetype, if you want
     cmd = 'lazygit',
-    auto_close = true,
     dimensions = {
       height = 0.9,
       width = 0.9
@@ -37,27 +37,4 @@ function M.config()
   vim.keymap.set('n', '<Plug>GitHistory', git_history, { desc = 'Show git history' })
 end
 
-local git_history = function()
-  local fterm = require('FTerm')
-  local file = vim.api.nvim_buf_get_name(0)
-  local cmd = 'git log -p --ext-diff ' .. file
-  fterm.scratch({
-    -- ft = 'git_history', -- You can also override the default filetype, if you want
-    cmd = cmd,
-    auto_close = true,
-    dimensions = {
-      height = 0.9,
-      width = 0.9
-    }
-  })
-end
-
-
-return {
-  'numToStr/FTerm.nvim',
-  keys = {
-    { '<Space>g', lazygit, { desc = 'Toggle lazygit' } },
-    { '<Space>H', git_history, { desc = 'Show git history' } }
-  },
-  lazy = true,
-}
+return M
diff --git a/dot_config/nvim/lua/configs/packages/gitsigns.lua b/dot_config/nvim/lua/configs/packages/gitsigns.lua
index 619c2dd..661c8d5 100644
--- a/dot_config/nvim/lua/configs/packages/gitsigns.lua
+++ b/dot_config/nvim/lua/configs/packages/gitsigns.lua
@@ -25,17 +25,17 @@ return {
       end, { expr = true, desc = 'Git prev hunk' })
 
       -- Actions
-      map({ 'n', 'v' }, '<leader>hs', ':Gitsigns stage_hunk<CR>', { desc = 'Gitsigns stage hunk' })
-      map({ 'n', 'v' }, '<leader>hr', ':Gitsigns reset_hunk<CR>', { desc = 'Gitsigns reset hunk' })
-      map('n', '<leader>hS', gs.stage_buffer, { desc = 'Gitsigns stage buffer' })
-      map('n', '<leader>hu', gs.undo_stage_hunk, { desc = 'Gitsigns undo stage hunk' })
-      map('n', '<leader>hR', gs.reset_buffer, { desc = 'Gitsigns reset buffer' })
-      map('n', '<leader>hp', gs.preview_hunk, { desc = 'Gitsigns preview hunk' })
-      map('n', '<leader>hb', function() gs.blame_line { full = true } end, { desc = 'Gitsigns blame line' })
-      map('n', '<leader>tb', gs.toggle_current_line_blame, { desc = 'Gitsigns toggle blame line' })
-      map('n', '<leader>hd', gs.diffthis, { desc = 'Gitsigns diff this' })
-      map('n', '<leader>hD', function() gs.diffthis('~') end, { desc = 'Gitsigns diff this ~' })
-      map('n', '<leader>td', gs.toggle_deleted, { desc = 'Gitsigns toggle deleted' })
+      map({ 'n', 'v' }, '<leader>gs', ':Gitsigns stage_hunk<CR>', { desc = 'Gitsigns stage hunk' })
+      map({ 'n', 'v' }, '<leader>gr', ':Gitsigns reset_hunk<CR>', { desc = 'Gitsigns reset hunk' })
+      map('n', '<leader>gS', gs.stage_buffer, { desc = 'Gitsigns stage buffer' })
+      map('n', '<leader>gu', gs.undo_stage_hunk, { desc = 'Gitsigns undo stage hunk' })
+      map('n', '<leader>gR', gs.reset_buffer, { desc = 'Gitsigns reset buffer' })
+      map('n', '<leader>gp', gs.preview_hunk, { desc = 'Gitsigns preview hunk' })
+      map('n', '<leader>gb', function() gs.blame_line { full = true } end, { desc = 'Gitsigns blame line' })
+      map('n', '<leader>gB', gs.toggle_current_line_blame, { desc = 'Gitsigns toggle blame line' })
+      map('n', '<leader>gd', gs.diffthis, { desc = 'Gitsigns diff this' })
+      map('n', '<leader>gD', function() gs.diffthis('~') end, { desc = 'Gitsigns diff this ~' })
+      map('n', '<leader>gd', gs.toggle_deleted, { desc = 'Gitsigns toggle deleted' })
 
       -- Text object
       map({ 'o', 'x' }, 'ih', ':<C-U>Gitsigns select_hunk<CR>', { desc = 'Inner git hunk' })
diff --git a/dot_config/nvim/lua/configs/packages/misc.lua b/dot_config/nvim/lua/configs/packages/misc.lua
index 9e13f37..a54fa7e 100644
--- a/dot_config/nvim/lua/configs/packages/misc.lua
+++ b/dot_config/nvim/lua/configs/packages/misc.lua
@@ -38,7 +38,6 @@ return {
   { 'andymass/vim-matchup' },
 
   { 'fpob/nette.vim', ft = 'nette' },
-
   { 'ziglang/zig.vim', ft = 'zig' },
 
   {