diff --git a/lua/nvchad/autocmds.lua b/lua/nvchad/autocmds.lua
index 42c964a..0e6260a 100644
--- a/lua/nvchad/autocmds.lua
+++ b/lua/nvchad/autocmds.lua
@@ -12,7 +12,7 @@ autocmd("FileType", {
 autocmd("BufWritePost", {
   pattern = vim.tbl_map(function(path)
     return vim.fs.normalize(vim.loop.fs_realpath(path))
-  end, vim.fn.glob(vim.fn.stdpath "config" .. "/lua/custom/**/*.lua", true, true, true)),
+  end, vim.fn.glob(vim.fn.stdpath "config" .. "/lua/**/*.lua", true, true, true)),
   group = vim.api.nvim_create_augroup("ReloadNvChad", {}),
 
   callback = function(opts)
diff --git a/lua/nvchad/configs/mason.lua b/lua/nvchad/configs/mason.lua
index 3692a15..a87f593 100644
--- a/lua/nvchad/configs/mason.lua
+++ b/lua/nvchad/configs/mason.lua
@@ -1,5 +1,5 @@
 local options = {
-  ensure_installed = { "lua-language-server" }, -- not an option from mason.nvim
+  ensure_installed = { "lua-language-server",  'stylua' }, -- not an option from mason.nvim
 
   PATH = "skip",
 
diff --git a/lua/nvchad/plugins/ui.lua b/lua/nvchad/plugins/ui.lua
index 34a6a97..29a6081 100644
--- a/lua/nvchad/plugins/ui.lua
+++ b/lua/nvchad/plugins/ui.lua
@@ -10,7 +10,7 @@ return {
 
   {
     "NvChad/ui",
-    branch = "v3.0",
+    branch = "starter",
     lazy = false,
     config = function()
       require "nvchad"
diff --git a/lua/nvchad/nvconfig.lua b/lua/nvconfig.lua
similarity index 90%
rename from lua/nvchad/nvconfig.lua
rename to lua/nvconfig.lua
index 5066ed2..dc4e72c 100644
--- a/lua/nvchad/nvconfig.lua
+++ b/lua/nvconfig.lua
@@ -25,15 +25,15 @@ M.ui = {
     -- default/round/block/arrow separators work only for default statusline theme
     -- round and block will work for minimal theme only
     separator_style = "default",
-    overriden_modules = nil,
+    order=nil,
   },
 
   -- lazyload it when there are 1+ buffers
   tabufline = {
-    show_numbers = false,
     enabled = true,
     lazyload = true,
-    overriden_modules = nil,
+    order= {'treeOffset', 'buffers' , 'tabs', 'btns'},
+    modules = nil,
   },
 
   -- nvdash (dashboard)
@@ -86,8 +86,6 @@ M.ui = {
   },
 }
 
-M.plugins = "" -- path i.e "custom.plugins", so make custom/plugins.lua file
-
 M.base46 = {
   integrations = {
     "blankline",
@@ -110,10 +108,6 @@ M.base46 = {
   },
 }
 
-local chadrc_exists, chadrc = pcall(require, "custom.chadrc")
-
-if chadrc_exists then
-  M = vim.tbl_deep_extend("force", M, chadrc)
-end
+M = vim.tbl_deep_extend("force", M, require('chadrc'))
 
 return M