diff --git a/after/plugin/defaults.lua b/after/plugin/defaults.lua
index 36f913c3..aa10b443 100644
--- a/after/plugin/defaults.lua
+++ b/after/plugin/defaults.lua
@@ -1,11 +1,7 @@
-vim.opt.relativenumber = true
 vim.opt.tabstop = 2
 vim.opt.shiftwidth = 2
 vim.opt.expandtab = true
 vim.bo.softtabstop = 2
 
--- Colorscheme
-vim.cmd.colorscheme 'gruvbox'
-
--- Nerd fonts
---vim.opt.guifont = ''
+-- Set custom colorscheme [[ NOTE: Never set it to onedark cuz it breaks the editor ]]
+vim.cmd.colorscheme 'tokyonight-night'
diff --git a/init.lua b/init.lua
index efe2cf99..0e17bc7b 100644
--- a/init.lua
+++ b/init.lua
@@ -210,6 +210,9 @@ require('lazy').setup({
         section_separators = '',
       },
     },
+    dependencies = {
+      'nvim-tree/nvim-web-devicons', opt = true
+    },
   },
 
   {
diff --git a/lazy-lock.json b/lazy-lock.json
index 6827b513..35da6414 100644
--- a/lazy-lock.json
+++ b/lazy-lock.json
@@ -4,12 +4,13 @@
   "cmp-nvim-lsp": { "branch": "main", "commit": "5af77f54de1b16c34b23cba810150689a3a90312" },
   "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" },
   "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" },
-  "coc.nvim": { "branch": "release", "commit": "7b9e1ef0a1399907c51d23b6080b94a5aba4a654" },
+  "colorschemes": { "branch": "master", "commit": "e29f32990d6e2c7c3a4763326194fbd847b49dac" },
   "fidget.nvim": { "branch": "main", "commit": "7dc62b9ce32ac0f21cfb510f243644ce28a39299" },
   "friendly-snippets": { "branch": "main", "commit": "53d3df271d031c405255e99410628c26a8f0d2b0" },
   "gitsigns.nvim": { "branch": "main", "commit": "6e05045fb1a4845fe44f5c54aafe024444c422ba" },
   "gruvbox.nvim": { "branch": "main", "commit": "0940564208a490c173216c3b7d2188b0a5ad3491" },
   "indent-blankline.nvim": { "branch": "master", "commit": "7206c77cb931f79885fc47f88ae18f99148392eb" },
+  "kanagawa.nvim": { "branch": "master", "commit": "c19b9023842697ec92caf72cd3599f7dd7be4456" },
   "lazy.nvim": { "branch": "main", "commit": "96584866b9c5e998cbae300594d0ccfd0c464627" },
   "lualine.nvim": { "branch": "master", "commit": "2248ef254d0a1488a72041cfb45ca9caada6d994" },
   "mason-lspconfig.nvim": { "branch": "main", "commit": "9453e3d6cd2ca45d96e20f343e8f1b927364b630" },
@@ -21,7 +22,7 @@
   "nvim-dap-go": { "branch": "main", "commit": "a5cc8dcad43f0732585d4793deb02a25c4afb766" },
   "nvim-dap-ui": { "branch": "master", "commit": "34160a7ce6072ef332f350ae1d4a6a501daf0159" },
   "nvim-lspconfig": { "branch": "master", "commit": "bd405e45c5fb122c16af8f87fa2dd7ab1981b243" },
-  "nvim-treesitter": { "branch": "master", "commit": "b6b9ca448b7f236e2e60f8393a729902511f9db9" },
+  "nvim-treesitter": { "branch": "master", "commit": "a6c655629cad421e432aa84af32cbfe35375113a" },
   "nvim-treesitter-textobjects": { "branch": "master", "commit": "ec1c5bdb3d87ac971749fa6c7dbc2b14884f1f6a" },
   "nvim-web-devicons": { "branch": "master", "commit": "8b2e5ef9eb8a717221bd96cb8422686d65a09ed5" },
   "onedark.nvim": { "branch": "master", "commit": "c5476a091b0f1b4e853db91c91ff941f848a1cdd" },
diff --git a/lua/custom/plugins/coc.lua b/lua/custom/plugins/coc.lua
deleted file mode 100644
index 15e833f4..00000000
--- a/lua/custom/plugins/coc.lua
+++ /dev/null
@@ -1,7 +0,0 @@
--- You can add your own plugins here or in other files in this directory!
---  I promise not to create any merge conflicts in this directory :)
---
--- See the kickstart.nvim README for more information
-return {
-	'neoclide/coc.nvim', branch='release'
-}
diff --git a/lua/custom/plugins/colorschemes.lua b/lua/custom/plugins/colorschemes.lua
index ef0c0b5f..6f336eff 100644
--- a/lua/custom/plugins/colorschemes.lua
+++ b/lua/custom/plugins/colorschemes.lua
@@ -6,47 +6,15 @@ return {
 
 	--tokyonight colorscheme
 	{
-		"folke/tokyonight.nvim",
-		lazy = false,
-		priority = 1000,
-		opts = {},
-		config = function()
-			require("tokyonight").setup({
-				-- your configuration comes here
-				-- or leave it empty to use the default settings
-				style = "night",    -- The theme comes in three styles, `storm`, `moon`, a darker variant `night` and `day`
-				light_style = "day", -- The theme is used when the background is set to light
-				transparent = false, -- Enable this to disable setting the background color
-				terminal_colors = true, -- Configure the colors used when opening a `:terminal` in [Neovim](https://github.com/neovim/neovim)
-				styles = {
-					-- Style to be applied to different syntax groups
-					-- Value is any valid attr-list value for `:help nvim_set_hl`
-					comments = { italic = true },
-					keywords = { italic = true },
-					functions = {},
-					variables = {},
-					-- Background styles. Can be "dark", "transparent" or "normal"
-					sidebars = "dark", -- style for sidebars, see below
-					floats = "dark", -- style for floating windows
-				},
-
-				sidebars = { "qf", "help" },  -- Set a darker background on sidebar-like windows. For example: `["qf", "vista_kind", "terminal", "packer"]`
-				day_brightness = 0.3,         -- Adjusts the brightness of the colors of the **Day** style. Number between 0 and 1, from dull to vibrant colors
-				hide_inactive_statusline = false, -- Enabling this option, will hide inactive statuslines and replace them with a thin border instead. Should work with the standard **StatusLine** and **LuaLine**.
-				dim_inactive = false,         -- dims inactive windows
-				lualine_bold = false,         -- When `true`, section headers in the lualine theme will be bold
-
-				--- You can override specific color groups to use other groups or a hex color
-				--- function will be called with a ColorScheme table
-				---@param colors ColorScheme
-				on_colors = function(colors) end,
-
-				--- You can override specific highlights to use other groups or a hex color
-				--- function will be called with a Highlights and ColorScheme table
-				---@param highlights Highlights
-				---@param colors ColorScheme
-				on_highlights = function(highlights, colors) end,
-			})
-		end
+		"folke/tokyonight.nvim", priority = 1000
 	},
+
+	-- lunar-vim colorschemes
+	{
+		"lunarvim/colorschemes", priority = 1000
+	},
+
+	{
+		"rebelot/kanagawa.nvim", priority = 1000
+	}
 }
diff --git a/lua/custom/plugins/web-devicons.lua b/lua/custom/plugins/web-devicons.lua
deleted file mode 100644
index 7d4a6557..00000000
--- a/lua/custom/plugins/web-devicons.lua
+++ /dev/null
@@ -1,40 +0,0 @@
-return {
-	'nvim-tree/nvim-web-devicons',
-	override = {
-		zsh = {
-			icon = "",
-			color = "#428850",
-			cterm_color = "65",
-			name = "Zsh"
-		}
-	},
-	-- globally enable different highlight colors per icon (default to true)
-	-- if set to false all icons will have the default icon's color
-	color_icons = true,
-	-- globally enable default icons (default to false)
-	-- will get overriden by `get_icons` option
-	default = true,
-	-- globally enable "strict" selection of icons - icon will be looked up in
-	-- different tables, first by filename, and if not found by extension; this
-	-- prevents cases when file doesn't have any extension but still gets some icon
-	-- because its name happened to match some extension (default to false)
-	strict = true,
-	-- same as `override` but specifically for overrides by filename
-	-- takes effect when `strict` is true
-	override_by_filename = {
-		[".gitignore"] = {
-			icon = "",
-			color = "#f1502f",
-			name = "Gitignore"
-		}
-	},
-	-- same as `override` but specifically for overrides by extension
-	-- takes effect when `strict` is true
-	override_by_extension = {
-		["log"] = {
-			icon = "",
-			color = "#81e043",
-			name = "Log"
-		}
-	},
-}