diff --git a/.tmux.conf b/.tmux.conf
index 87099fd..a0dde55 100644
--- a/.tmux.conf
+++ b/.tmux.conf
@@ -6,7 +6,7 @@ set -g prefix C-space
 bind-key C-space send-prefix
 
 # Shortcut to custom hints
-bind-key -n C-h run-shell "tmux popup -xC -yC -w50% -h75% 'cat ~/.tmux/hints'"
+bind h run-shell "tmux popup -xC -yC -w50% -h75% 'cat ~/.tmux/hints'"
 
 # Shortcut to sync panes
 bind C-x setw synchronize-panes
@@ -77,5 +77,13 @@ set -g @resurrect-processes 'ssh nano k9s'
 set -g @plugin 'tmux-plugins/tmux-open'
 set -g @open-S 'https://search.brave.com/search?q='
 
+# Integrate with nvim navigation
+set -g @plugin 'christoomey/vim-tmux-navigator'
+set -g @vim_navigator_mapping_left "C-Left C-h"
+set -g @vim_navigator_mapping_right "C-Right C-l"
+set -g @vim_navigator_mapping_up "C-Up C-k"
+set -g @vim_navigator_mapping_down "C-Down C-j"
+
+
 # Load Plugins
 run '~/.tmux/plugins/tpm/tpm'
diff --git a/.tmux/plugins/vim-tmux-navigator b/.tmux/plugins/vim-tmux-navigator
new file mode 160000
index 0000000..33afa80
--- /dev/null
+++ b/.tmux/plugins/vim-tmux-navigator
@@ -0,0 +1 @@
+Subproject commit 33afa80db65113561dc53fa732b7f5e53d5ecfd0
diff --git a/nvim/init.lua b/nvim/init.lua
index 8fb9b20..43d9da7 100644
--- a/nvim/init.lua
+++ b/nvim/init.lua
@@ -4,6 +4,12 @@ vim.cmd("set tabstop=2")
 vim.cmd("set softtabstop=2")
 vim.cmd("set shiftwidth=2")
 
+-- Configure Navigation Keys
+--vim.keymap.set('n', '<c-Left>', ':wincmd h<CR>')
+--vim.keymap.set('n', '<c-Right>', ':wincmd l<CR>')
+--vim.keymap.set('n', '<c-Up>', ':wincmd k<CR>')
+--vim.keymap.set('n', '<c-Down>', ':wincmd j<CR>')
+
 -- Configure Editor Settings
 vim.cmd("set number")
 vim.opt.guifont = "JetBrainsMonoNerdFontMono:14"
@@ -16,10 +22,14 @@ require("config.lazy")
 -- Configure Telescope Keymaps
 local builtin = require("telescope.builtin")
 vim.keymap.set('n', '<C-p>', builtin.find_files, {})
-vim.keymap.set('n', '<leader>g', builtin.live_grep, {})
+vim.keymap.set('n', '<leader>gg', builtin.live_grep, {})
 
 -- Init Treesitter Syntax Highlighting
 --require("config.treesitter")
 
 -- Configure NeoTree (FS View)
 vim.keymap.set('n', '<leader>f', ':Neotree filesystem reveal left<CR>')
+
+-- Configure Git
+vim.keymap.set('n', '<leader>gd', ':Gitsigns preview_hunk<CR>', {})
+vim.keymap.set('n', '<leader>gb', ':Gitsigns toggle_current_line_blame<CR>', {})
diff --git a/nvim/lua/plugins/nvim-tmux-navigator.lua b/nvim/lua/plugins/nvim-tmux-navigator.lua
new file mode 100644
index 0000000..1e7cbc3
--- /dev/null
+++ b/nvim/lua/plugins/nvim-tmux-navigator.lua
@@ -0,0 +1,7 @@
+return {
+  "christoomey/vim-tmux-navigator",
+  vim.keymap.set('n', '<c-Left>', ':TmuxNavigateLeft<CR>'),
+  vim.keymap.set('n', '<c-Right>', ':TmuxNavigateRight<CR>'),
+  vim.keymap.set('n', '<c-Up>', ':TmuxNavigateUp<CR>'),
+  vim.keymap.set('n', '<c-Down>', ':TmuxNavigateDown<CR>'),
+}