diff --git a/after/plugin/defaults.lua b/after/plugin/lualine-config.lua
similarity index 75%
rename from after/plugin/defaults.lua
rename to after/plugin/lualine-config.lua
index f44bcd0f..4e02b4bf 100644
--- a/after/plugin/defaults.lua
+++ b/after/plugin/lualine-config.lua
@@ -1,12 +1,3 @@
-vim.go.tabstop = 2
-vim.go.shiftwidth = 2
-vim.go.expandtab = true
-vim.bo.softtabstop = 2
-vim.go.relativenumber = true
-vim.keymap.set('t', '<Esc>', [[<C-\><C-n>]], { noremap = true })
-vim.cmd.colorscheme 'rose-pine' -- Set custom colorscheme [[ NOTE: Never set it to "onedark" cuz it breaks the editor ]]
-
--- Lualine config
 require('lualine').setup {
   options = {
     icons_enabled = true,
diff --git a/after/plugin/settings.lua b/after/plugin/settings.lua
new file mode 100644
index 00000000..6f6dcb52
--- /dev/null
+++ b/after/plugin/settings.lua
@@ -0,0 +1,7 @@
+vim.opt.tabstop = 2
+vim.opt.shiftwidth = 2
+vim.opt.expandtab = true
+vim.bo.softtabstop = 2
+vim.opt.relativenumber = true
+vim.keymap.set('t', '<Esc>', [[<C-\><C-n>]], { noremap = true }) -- Set keymap to exit terminal using 'exit'
+vim.cmd.colorscheme 'rose-pine-main'                             -- Set custom colorscheme [[ NOTE: Never set it to "onedark" cuz it breaks the editor ]]
diff --git a/lazy-lock.json b/lazy-lock.json
index 4a25f65e..6f89af50 100644
--- a/lazy-lock.json
+++ b/lazy-lock.json
@@ -31,7 +31,6 @@
   "nvim-treesitter-textobjects": { "branch": "master", "commit": "85b9d0cbd4ff901abcda862b50dbb34e0901848b" },
   "nvim-web-devicons": { "branch": "master", "commit": "3e24abe1ae66532135cec911562f553fe247cb56" },
   "onedark.nvim": { "branch": "master", "commit": "c5476a091b0f1b4e853db91c91ff941f848a1cdd" },
-  "oxocarbon.nvim": { "branch": "main", "commit": "c5846d10cbe4131cc5e32c6d00beaf59cb60f6a2" },
   "plenary.nvim": { "branch": "master", "commit": "55d9fe89e33efd26f532ef20223e5f9430c8b0c0" },
   "rose-pine": { "branch": "main", "commit": "92762f4fa2144c05db760ea254f4c399a56a7ef5" },
   "telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" },
diff --git a/lua/custom/plugins/colorschemes.lua b/lua/custom/plugins/colorschemes.lua
index 1d57bb6c..3df1cd2d 100644
--- a/lua/custom/plugins/colorschemes.lua
+++ b/lua/custom/plugins/colorschemes.lua
@@ -14,9 +14,6 @@ return {
 	-- latte, frappe, macchiato, mocha
 	{ "catppuccin/catppuccin",    priority = 1000, },
 
-	-- Theme inspired by Atom
-	{ 'navarasu/onedark.nvim',    priority = 1000, },
-
 	--Rosepine (Primeagen)
 	{
 		'rose-pine/neovim',