diff --git a/lua/config/keymaps.lua b/lua/config/keymaps.lua
index bc26802c..d7223c9f 100644
--- a/lua/config/keymaps.lua
+++ b/lua/config/keymaps.lua
@@ -19,9 +19,11 @@ map("n", "-", "<CMD>Oil<CR>", { desc = "Open parent directory" } )
 -- Change current dir
 map("n", "<leader>cc", "<cmd>cd %:p:h<CR>", { desc = "Change current dir to a current buffer" })
 
-map("n", "<leader>vt", function()
+map("n", "<leader>ot", function()
 	vim.cmd.new()
 	vim.cmd.term()
 	vim.cmd.wincmd("J")
   vim.api.nvim_win_set_height(0, 15)
 end)
+
+map("t", "<Esc>", "<C-\\><C-n>", { desc = "Escape to Normal mode in terminal" })
diff --git a/lua/plugins/gitsigns.lua b/lua/plugins/gitsigns.lua
index eeb82108..f5fa5cf6 100644
--- a/lua/plugins/gitsigns.lua
+++ b/lua/plugins/gitsigns.lua
@@ -1,5 +1,6 @@
 return { -- Adds git related signs to the gutter, as well as utilities for managing changes
   'lewis6991/gitsigns.nvim',
+	 event = 'VimEnter',
    opts = {
     signs = {
       add = { text = '+' },
diff --git a/lua/plugins/oil.lua b/lua/plugins/oil.lua
new file mode 100644
index 00000000..1ab3c780
--- /dev/null
+++ b/lua/plugins/oil.lua
@@ -0,0 +1,10 @@
+return {
+  "stevearc/oil.nvim",
+  event = 'VimEnter', -- Loads the plugin when nvim finishes starting up.
+  lazy = false,
+ 	dependencies = { "nvim-tree/nvim-web-devicons" },
+ 	config = function ()
+ 		require("oil").setup({})
+ 	end
+}
+
diff --git a/lua/plugins/plugins.lua b/lua/plugins/plugins.lua
index 2ac434b1..9f06546a 100644
--- a/lua/plugins/plugins.lua
+++ b/lua/plugins/plugins.lua
@@ -1,5 +1,3 @@
-local keymap = vim.keymap.set
-
 return {
 
   {
@@ -57,6 +55,7 @@ return {
 
 	{
     "echasnovski/mini.nvim",
+    event = 'VimEnter', -- Loads the plugin when nvim finishes starting up.
     config = function()
       -- Better Around/Inside textobjects
       require("mini.ai").setup { n_lines = 500 }
@@ -70,13 +69,4 @@ return {
     end,
   },
 
-  {
-    "stevearc/oil.nvim",
-    event = 'VimEnter', -- Loads the plugin when nvim finishes starting up.
-    lazy = false,
-		dependencies = { "nvim-tree/nvim-web-devicons" },
-		config = function ()
-			require("oil").setup({})
-		end
-  },
 }