diff --git a/lazy-lock.json b/lazy-lock.json
index a2ce6c1..05d10e5 100644
--- a/lazy-lock.json
+++ b/lazy-lock.json
@@ -13,36 +13,35 @@
   "codeium.vim": { "branch": "main", "commit": "9406f13cf3eaa08318b76746bd105a04506cab27" },
   "dressing.nvim": { "branch": "master", "commit": "42d767b04c50a6966c9633e3968bc65c0c2f2bfc" },
   "friendly-snippets": { "branch": "main", "commit": "3e9a3f5a0cfcef1741e352c37bda4e82e5eb846a" },
+  "github-nvim-theme": { "branch": "main", "commit": "66dcec1bd3d12f8b0bf3c885069888551a650049" },
   "gitsigns.nvim": { "branch": "main", "commit": "76927d14d3fbd4ba06ccb5246e79d93b5442c188" },
   "indent-blankline.nvim": { "branch": "master", "commit": "3d08501caef2329aba5121b753e903904088f7e6" },
   "lazy.nvim": { "branch": "main", "commit": "bef521ac89c8d423f9d092e37b58e8af0c099309" },
   "lsp-progress.nvim": { "branch": "main", "commit": "0d45f17f681c2e664238a1f6c02865760692609d" },
   "lualine.nvim": { "branch": "master", "commit": "0a5a66803c7407767b799067986b4dc3036e1983" },
-  "mason-lspconfig.nvim": { "branch": "main", "commit": "1a14770dc8c7cb29643870ac79788eec6f7ce1f8" },
+  "mason-lspconfig.nvim": { "branch": "main", "commit": "9ae570e206360e47d30b4c35a4550c165f4ea7b7" },
   "mason-null-ls.nvim": { "branch": "main", "commit": "2b8433f76598397fcc97318d410e0c4f7a4bea6a" },
   "mason.nvim": { "branch": "main", "commit": "c43eeb5614a09dc17c03a7fb49de2e05de203924" },
   "mini.indentscope": { "branch": "main", "commit": "a8274b6ea2d868198d27bd91a31ed5ea3a6a5744" },
-  "noice.nvim": { "branch": "main", "commit": "0cbe3f88d038320bdbda3c4c5c95f43a13c3aa12" },
-  "none-ls-extras.nvim": { "branch": "main", "commit": "c7264e9b97a051ccb955ae178b6fb3e0e9936a45" },
+  "noice.nvim": { "branch": "main", "commit": "09102ca2e9a3e9302119fdaf7a059a034e4a626d" },
+  "none-ls-extras.nvim": { "branch": "main", "commit": "336e84b9e43c0effb735b08798ffac382920053b" },
   "none-ls.nvim": { "branch": "main", "commit": "f5632db2491fbe02b54f1a321a98548a8ba2bd15" },
   "nui.nvim": { "branch": "main", "commit": "a0fd35fcbb4cb479366f1dc5f20145fd718a3733" },
   "nvim-autopairs": { "branch": "master", "commit": "14e97371b2aab6ee70054c1070a123dfaa3e217e" },
   "nvim-cmp": { "branch": "main", "commit": "cd2cf0c124d3de577fb5449746568ee8e601afc8" },
   "nvim-colorizer.lua": { "branch": "master", "commit": "85855b38011114929f4058efc97af1059ab3e41d" },
-  "nvim-jdtls": { "branch": "master", "commit": "a5c6f38f8151d7b4f5b32c005a95022fa66f4c9d" },
   "nvim-lspconfig": { "branch": "master", "commit": "cf3dd4a290084a868fac0e2e876039321d57111c" },
   "nvim-material-icon": { "branch": "main", "commit": "7a8893417c6947925d00946d16b81b56574796a9" },
   "nvim-navic": { "branch": "master", "commit": "8649f694d3e76ee10c19255dece6411c29206a54" },
   "nvim-notify": { "branch": "master", "commit": "5371f4bfc1f6d3adf4fe9d62cd3a9d44356bfd15" },
   "nvim-scrollview": { "branch": "main", "commit": "c29c5f69d37040a1fac88cbea7f5e6f06f0aff4d" },
-  "nvim-tree.lua": { "branch": "master", "commit": "76db7ed0da3027882dd0a72de18643c2e26956dc" },
+  "nvim-tree.lua": { "branch": "master", "commit": "78c4c083ed5d47e7fab7627d78ce33d3bcfb88f0" },
   "nvim-treesitter": { "branch": "master", "commit": "f197a15b0d1e8d555263af20add51450e5aaa1f0" },
   "nvim-ts-autotag": { "branch": "main", "commit": "531f48334c422222aebc888fd36e7d109cb354cd" },
   "nvim-ts-context-commentstring": { "branch": "main", "commit": "0bdccb9c67a42a5e2d99384dc9bfa29b1451528f" },
   "nvim-ts-rainbow2": { "branch": "master", "commit": "b3120cd5ae9ca524af9cb602f41e12e301fa985f" },
   "nvim-ufo": { "branch": "main", "commit": "a5390706f510d39951dd581f6d2a972741b3fa26" },
-  "nvim-web-devicons": { "branch": "master", "commit": "a55b801b7ef5719ca25692c3a0a5447fdfb692ed" },
-  "onedarkpro.nvim": { "branch": "main", "commit": "ec07364f3cfa9cc6467bf067a490cfd74011efcd" },
+  "nvim-web-devicons": { "branch": "master", "commit": "5b9067899ee6a2538891573500e8fd6ff008440f" },
   "plenary.nvim": { "branch": "master", "commit": "50012918b2fc8357b87cff2a7f7f0446e47da174" },
   "promise-async": { "branch": "main", "commit": "38a4575da9497326badd3995e768b4ccf0bb153e" },
   "smart-splits.nvim": { "branch": "master", "commit": "2179ec0d26aacd4f40c766c79f6ebc83b7001e48" },
diff --git a/lua/core/init.lua b/lua/core/init.lua
index c77801c..44c794d 100644
--- a/lua/core/init.lua
+++ b/lua/core/init.lua
@@ -17,5 +17,5 @@ require("custom.keymaps")
 -- require("user.chat_gpt")
 -- vim.cmd("colorscheme one_monokai")
 -- vim.cmd("colorscheme onedark")
--- vim.cmd("colorscheme github_dark_dimmed")
+vim.cmd("colorscheme github_dark_dimmed")
 -- vim.cmd("colorscheme github_dark_high_contrast")
diff --git a/lua/custom/plugins/githubdark.lua b/lua/custom/plugins/githubdark.lua
index 680a32f..884c80b 100644
--- a/lua/custom/plugins/githubdark.lua
+++ b/lua/custom/plugins/githubdark.lua
@@ -1,100 +1,105 @@
 return {
-	-- {
-	-- 	"navarasu/onedark.nvim",
-	-- 	enabled = false,
-	-- },
-	-- {
-	-- 	"projekt0n/github-nvim-theme",
-	-- 	lazy = false, -- make sure we load this during startup if it is your main colorscheme
-	-- 	priority = 1000, -- make sure to load this before all the other start plugins
-	-- 	config = function()
-	-- 		local is_transparent = false
-	-- 		local palette = require("github-theme.palette").load("github_dark_dimmed")
-	-- 		require("github-theme").setup({
-	-- 			options = {
-	-- 				-- Compiled file's destination location
-	-- 				compile_path = vim.fn.stdpath("cache") .. "/github-theme",
-	-- 				compile_file_suffix = "_compiled", -- Compiled file suffix
-	-- 				hide_end_of_buffer = true, -- Hide the '~' character at the end of the buffer for a cleaner look
-	-- 				hide_nc_statusline = true, -- Override the underline style for non-active statuslines
-	-- 				transparent = is_transparent, -- Disable setting background
-	-- 				terminal_colors = true, -- Set terminal colors (vim.g.terminal_color_*) used in `:terminal`
-	-- 				dim_inactive = false, -- Non focused panes set to alternative background
-	-- 				module_default = true, -- Default enable value for modules
-	-- 				styles = { -- Style to be applied to different syntax groups
-	-- 					comments = "italic", -- Value is any valid attr-list value `:help attr-list`
-	-- 					functions = "italic",
-	-- 					keywords = "NONE",
-	-- 					variables = "NONE",
-	-- 					conditionals = "NONE",
-	-- 					constants = "NONE",
-	-- 					numbers = "NONE",
-	-- 					operators = "NONE",
-	-- 					strings = "NONE",
-	-- 					types = "NONE",
-	-- 				},
-	-- 				inverse = { -- Inverse highlight for different types
-	-- 					match_paren = false,
-	-- 					visual = false,
-	-- 					search = false,
-	-- 				},
-	-- 				darken = { -- Darken floating windows and sidebar-like windows
-	-- 					floats = false,
-	-- 					sidebars = {
-	-- 						enabled = true,
-	-- 						list = {}, -- Apply dark background to specific windows
-	-- 					},
-	-- 				},
-	-- 				modules = { -- List of various plugins and additional options
-	-- 					-- ...
-	-- 				},
-	-- 			},
-	-- 			palettes = {
-	-- 				github_dark_dimmed = {
-	-- 					bg0 = is_transparent and "NONE" or "bg1",
-	-- 					bg1 = is_transparent and "NONE" or "bg",
-	-- 				},
-	-- 			},
-	-- 			specs = {},
-	-- 			groups = {
-	-- 				all = {
-	-- 					illuminatedWord = { bg = "#3b4261" },
-	-- 					illuminatedCurWord = { bg = "#3b4261" },
-	-- 					IlluminatedWordText = { bg = "#3b4261" },
-	-- 					IlluminatedWordRead = { bg = "#3b4261" },
-	-- 					IlluminatedWordWrite = { bg = "#3b4261" },
-	-- 					["@tag.attribute"] = { fg = "#77bdfb", style = "italic" },
-	-- 					["@text.uri"] = { fg = palette.const, style = "italic" },
-	-- 					["@keyword.return"] = { fg = "#fa7970", style = "italic" },
-	-- 					-- ["@tag.attribute.html"] = { fg = "#faa356", style = "italic" },
-	-- 					-- ["@operator.html"] = { fg = "#faa356" },
-	-- 					-- ["@tag.html"] = { fg = "#fa7970" },
-	-- 					-- ["@tag.delimiter.html"] = { fg = "#faa356" },
-	-- 					["@tag.javascript"] = { fg = "#faa356" },
-	-- 					["@tag.tsx"] = { fg = "#faa356" },
-	-- 				},
-	-- 				github_dark_high_contrast = {
-	-- 					NvimTreeSpecialFile = { fg = "#faa356", style = "italic" },
-	-- 				},
-	-- 				github_dark_dimmed = {
-	-- 					-- As with specs and palettes, a specific style's value will be used over the `all`'s value.
-	-- 					NvimTreeNormal = { fg = "fg1", bg = is_transparent and "NONE" or "bg1" },
-	-- 					NvimTreeSpecialFile = { fg = "#faa356", style = "italic" },
-	-- 					NvimTreeIndentMarker = { fg = "#3E4450" },
-	-- 					BufferLineFill = { bg = is_transparent and "NONE" or "bg1" },
-	-- 					BufferLineUnfocusedFill = { bg = is_transparent and "NONE" or "bg1" },
-	-- 					LualineNormal = { bg = is_transparent and "NONE" or "bg1" },
-	-- 					StatusLine = { bg = is_transparent and "NONE" or "bg1" },
-	-- 					StatusLineTerm = { bg = is_transparent and "NONE" or "bg1" },
-	-- 					Pmenu = { bg = is_transparent and "NONE" or "bg1" },
-	-- 					PmenuSel = { link = "CursorLine" },
-	-- 					WhichKeyFloat = { bg = is_transparent and "NONE" or "bg1" },
-	-- 					LazyNormal = { bg = is_transparent and "NONE" or "bg1" },
-	-- 					LazyBackground = { bg = is_transparent and "NONE" or "bg1" },
-	-- 					NormalSB = { fg = "fg1", bg = "bg1" }, -- normal text
-	-- 				},
-	-- 			},
-	-- 		})
-	-- 	end,
-	-- },
+	{
+		"navarasu/onedark.nvim",
+		enabled = false,
+	},
+	{
+		"projekt0n/github-nvim-theme",
+		lazy = false, -- make sure we load this during startup if it is your main colorscheme
+		priority = 1000, -- make sure to load this before all the other start plugins
+		config = function()
+			local is_transparent = false
+			local palette = require("github-theme.palette").load("github_dark_dimmed")
+			require("github-theme").setup({
+				options = {
+					-- Compiled file's destination location
+					compile_path = vim.fn.stdpath("cache") .. "/github-theme",
+					compile_file_suffix = "_compiled", -- Compiled file suffix
+					hide_end_of_buffer = true, -- Hide the '~' character at the end of the buffer for a cleaner look
+					hide_nc_statusline = true, -- Override the underline style for non-active statuslines
+					transparent = is_transparent, -- Disable setting background
+					terminal_colors = true, -- Set terminal colors (vim.g.terminal_color_*) used in `:terminal`
+					dim_inactive = false, -- Non focused panes set to alternative background
+					module_default = true, -- Default enable value for modules
+					styles = { -- Style to be applied to different syntax groups
+						comments = "italic", -- Value is any valid attr-list value `:help attr-list`
+						functions = "italic",
+						keywords = "NONE",
+						variables = "NONE",
+						conditionals = "NONE",
+						constants = "NONE",
+						numbers = "NONE",
+						operators = "NONE",
+						strings = "NONE",
+						types = "NONE",
+					},
+					inverse = { -- Inverse highlight for different types
+						match_paren = false,
+						visual = false,
+						search = false,
+					},
+					darken = { -- Darken floating windows and sidebar-like windows
+						floats = false,
+						sidebars = {
+							enabled = true,
+							list = {}, -- Apply dark background to specific windows
+						},
+					},
+					modules = { -- List of various plugins and additional options
+						-- ...
+					},
+				},
+				palettes = {
+					github_dark_dimmed = {
+						bg0 = is_transparent and "NONE" or "bg1",
+						bg1 = is_transparent and "NONE" or "bg",
+					},
+				},
+				specs = {},
+				groups = {
+					all = {
+						illuminatedWord = { bg = "#3b4261" },
+						illuminatedCurWord = { bg = "#3b4261" },
+						IlluminatedWordText = { bg = "#3b4261" },
+						IlluminatedWordRead = { bg = "#3b4261" },
+						IlluminatedWordWrite = { bg = "#3b4261" },
+						["@tag.attribute"] = { fg = "#77bdfb", style = "italic" },
+						["@text.uri"] = { fg = palette.const, style = "italic" },
+						["@keyword.return"] = { fg = "#fa7970", style = "italic" },
+						-- ["@tag.attribute.html"] = { fg = "#faa356", style = "italic" },
+						-- ["@operator.html"] = { fg = "#faa356" },
+						-- ["@tag.html"] = { fg = "#fa7970" },
+						-- ["@tag.delimiter.html"] = { fg = "#faa356" },
+						["@tag.javascript"] = { fg = "#faa356" },
+						["@tag.tsx"] = { fg = "#faa356" },
+					},
+					github_dark_high_contrast = {
+						NvimTreeSpecialFile = { fg = "#faa356", style = "italic" },
+					},
+					github_dark_dimmed = {
+						-- As with specs and palettes, a specific style's value will be used over the `all`'s value.
+						NvimTreeNormal = { fg = "fg1", bg = is_transparent and "NONE" or "bg1" },
+						NvimTreeSpecialFile = { fg = "#faa356", style = "italic" },
+						NvimTreeIndentMarker = { fg = "#3E4450" },
+						BufferLineFill = { bg = is_transparent and "NONE" or "bg1" },
+						BufferLineUnfocusedFill = { bg = is_transparent and "NONE" or "bg1" },
+						LualineNormal = { bg = is_transparent and "NONE" or "bg1" },
+						StatusLine = { bg = is_transparent and "NONE" or "bg1" },
+						StatusLineTerm = { bg = is_transparent and "NONE" or "bg1" },
+						Pmenu = { bg = is_transparent and "NONE" or "bg1" },
+						PmenuSel = { link = "CursorLine" },
+						WhichKeyFloat = { bg = is_transparent and "NONE" or "bg1" },
+						LazyNormal = { bg = is_transparent and "NONE" or "bg1" },
+						LazyBackground = { bg = is_transparent and "NONE" or "bg1" },
+						NormalSB = { fg = "fg1", bg = is_transparent and "NONE" or "bg1" }, -- normal text
+						NormalFloat = { fg = "fg1", bg = is_transparent and "NONE" or "bg1" },
+						IblIndent = { fg = "#3E4450" },
+						["@property.lua"] = { fg = "#91cbff", bg = is_transparent and "NONE" or "bg1" },
+						["@lsp.type.property.lua"] = { fg = "fg1", bg = is_transparent and "NONE" or "bg1" },
+						["@lsp.type.variable.lua"] = { fg = "#91cbff", bg = is_transparent and "NONE" or "bg1" },
+					},
+				},
+			})
+		end,
+	},
 }
diff --git a/lua/custom/plugins/lualine_backup.lua b/lua/custom/plugins/lualine_backup.lua
index 277d956..06a5c32 100644
--- a/lua/custom/plugins/lualine_backup.lua
+++ b/lua/custom/plugins/lualine_backup.lua
@@ -1,290 +1,290 @@
 return {
-	-- {
-	-- 	"nvim-lualine/lualine.nvim",
-	-- 	event = "InsertEnter",
-	-- 	config = function()
-	-- 		local hide_in_width = function()
-	-- 			return vim.fn.winwidth(0) > 80
-	-- 		end
-	-- 		local icons = require("user.icons")
-	--
-	-- 		local getLeftSubstring = function(word, length)
-	-- 			if #word > length then
-	-- 				return string.sub(word, 1, length) .. "..."
-	-- 			else
-	-- 				return word
-	-- 			end
-	-- 		end
-	--
-	-- 		-- start for lsp
-	-- 		local list_registered_providers_names = function(filetype)
-	-- 			local s = require("null-ls.sources")
-	-- 			local available_sources = s.get_available(filetype)
-	-- 			local registered = {}
-	-- 			for _, source in ipairs(available_sources) do
-	-- 				for method in pairs(source.methods) do
-	-- 					registered[method] = registered[method] or {}
-	-- 					table.insert(registered[method], source.name)
-	-- 				end
-	-- 			end
-	-- 			return registered
-	-- 		end
-	--
-	-- 		local null_ls = require("null-ls")
-	-- 		-- for formatter
-	-- 		local list_registered = function(filetype)
-	-- 			local method = null_ls.methods.FORMATTING
-	-- 			local registered_providers = list_registered_providers_names(filetype)
-	-- 			return registered_providers[method] or {}
-	-- 		end
-	--
-	-- 		--- for linter
-	-- 		local alternative_methods = {
-	-- 			null_ls.methods.DIAGNOSTICS,
-	-- 			null_ls.methods.DIAGNOSTICS_ON_OPEN,
-	-- 			null_ls.methods.DIAGNOSTICS_ON_SAVE,
-	-- 		}
-	--
-	-- 		local linter_list_registered = function(filetype)
-	-- 			local registered_providers = list_registered_providers_names(filetype)
-	-- 			local providers_for_methods = vim.tbl_flatten(vim.tbl_map(function(m)
-	-- 				return registered_providers[m] or {}
-	-- 			end, alternative_methods))
-	--
-	-- 			return providers_for_methods
-	-- 		end
-	-- 		-- end for lsp
-	--
-	-- 		local lsp_info = {
-	-- 			function()
-	-- 				local msg = "LS Inactive"
-	-- 				local buf_ft = vim.bo.filetype
-	-- 				local clients = vim.lsp.get_active_clients()
-	-- 				-- start register
-	-- 				local buf_clients = vim.lsp.buf_get_clients()
-	-- 				local buf_client_names = {}
-	-- 				if next(buf_clients) == nil then
-	-- 					-- TODO: clean up this if statement
-	-- 					if type(msg) == "boolean" or #msg == 0 then
-	-- 						return "LS Inactive"
-	-- 					end
-	-- 					return msg
-	-- 				end
-	-- 				-- add client
-	-- 				for _, client in pairs(buf_clients) do
-	-- 					if client.name ~= "null-ls" and client.name ~= "copilot" then
-	-- 						table.insert(buf_client_names, client.name)
-	-- 					end
-	-- 				end
-	-- 				-- add formatter
-	-- 				local supported_formatters = list_registered(buf_ft)
-	-- 				vim.list_extend(buf_client_names, supported_formatters)
-	-- 				-- add linter
-	-- 				local supported_linters = linter_list_registered(buf_ft)
-	-- 				vim.list_extend(buf_client_names, supported_linters)
-	-- 				-- decomple
-	-- 				local unique_client_names = vim.fn.uniq(buf_client_names)
-	-- 				local msg = table.concat(unique_client_names, ", ")
-	-- 				return msg
-	-- 			end,
-	-- 			--icon = " ",
-	-- 			icon = icons.ui.Gear .. "",
-	-- 			padding = 1,
-	-- 		}
-	--
-	-- 		local diagnostics = {
-	-- 			"diagnostics",
-	-- 			sources = { "nvim_diagnostic" },
-	-- 			sections = { "error", "warn" },
-	-- 			-- symbols = { error = " ", warn = " " },
-	-- 			symbols = {
-	-- 				error = icons.diagnostics.BoldError .. " ",
-	-- 				warn = icons.diagnostics.BoldWarning .. " ",
-	-- 			},
-	-- 			colored = true,
-	-- 			update_in_insert = false,
-	-- 			always_visible = false,
-	-- 		}
-	--
-	-- 		local diff = {
-	-- 			"diff",
-	-- 			colored = true,
-	-- 			-- symbols = { added = " ", modified = " ", removed = " " }, -- changes diff symbols
-	-- 			symbols = {
-	-- 				added = icons.git.LineAdded .. " ",
-	-- 				modified = icons.git.LineModified .. " ",
-	-- 				removed = icons.git.LineRemoved .. " ",
-	-- 			}, -- changes diff symbols
-	-- 			cond = hide_in_width,
-	-- 		}
-	--
-	-- 		local spaces = function()
-	-- 			-- return " " .. vim.api.nvim_buf_get_option(0, "shiftwidth")
-	-- 			return icons.ui.Tab .. " " .. vim.api.nvim_buf_get_option(0, "shiftwidth")
-	-- 		end
-	--
-	-- 		local mode = {
-	-- 			"mode",
-	-- 			padding = 1,
-	-- 			separator = { left = " " },
-	-- 			-- right_padding = 3,
-	-- 			fmt = function(str)
-	-- 				return icons.ui.Neovim .. " " .. str
-	-- 			end,
-	-- 		}
-	-- 		local branch = {
-	-- 			"branch",
-	-- 			padding = 1,
-	-- 		}
-	--
-	-- 		local get_branch = function()
-	-- 			if vim.b.gitsigns_head ~= nil then
-	-- 				return icons.git.Branch2 .. " " .. getLeftSubstring(vim.b.gitsigns_head, 6)
-	-- 			else
-	-- 				return icons.git.Branch2 .. vim.fn.fnamemodify("", ":t")
-	-- 			end
-	-- 		end
-	--
-	-- 		local lsp_progress = {}
-	-- 		local data_ok, lspprogress = pcall(require, "lsp-progress")
-	-- 		if data_ok then
-	-- 			lsp_progress = lspprogress.progress
-	-- 		end
-	--      -- stylua: ignore
-	--      local colors = {
-	--        blue              = '#50fa7b',
-	--        cyan              = '#f1fa8c',
-	--        black             = '#1a1b26',
-	--        black_transparant = 'none',
-	--        white             = '#c6c6c6',
-	--        red               = "#ff757f",
-	--        skyblue_1         = '#bd93f9',
-	--        grey              = '#5f6a8e',
-	--        yellow            = "#ffb86c",
-	--        fg_gutter         = "#3b4261",
-	--        green1            = "#bd93f9",
-	--      }
-	--
-	-- 		-- check config for theme
-	-- 		local set_theme
-	-- 		local bubbles_theme = {}
-	-- 		local data_exists, config = pcall(require, "core.config")
-	-- 		if data_exists then
-	-- 			if config.colorscheme ~= nil then
-	-- 				local color = config.colorscheme
-	-- 				switch(color, {
-	-- 					["tokyonight"] = function()
-	-- 						set_theme = "auto"
-	-- 					end,
-	-- 					["tokyonight-night"] = function()
-	-- 						set_theme = "auto"
-	-- 					end,
-	-- 					["tokyonight-storm"] = function()
-	-- 						set_theme = "auto"
-	-- 					end,
-	-- 					["tokyonight-day"] = function()
-	-- 						set_theme = "auto"
-	-- 					end,
-	-- 					["tokyonight-moon"] = function()
-	-- 						set_theme = "auto"
-	-- 					end,
-	-- 					["dracula"] = function()
-	-- 						local clr = require("dracula").colors()
-	-- 						colors.blue = clr.green
-	-- 						colors.black = clr.black
-	-- 						colors.cyan = clr.yellow
-	-- 						set_theme = bubbles_theme
-	-- 					end,
-	-- 					default = function()
-	-- 						set_theme = "auto"
-	-- 					end,
-	-- 				})
-	-- 			end
-	-- 		end
-	--
-	-- 		bubbles_theme = {
-	-- 			normal = {
-	-- 				a = { fg = colors.black, bg = colors.skyblue_1 },
-	-- 				b = { fg = colors.white, bg = colors.grey },
-	-- 				c = { fg = colors.white, bg = colors.black_transparant },
-	-- 			},
-	--
-	-- 			insert = {
-	-- 				a = { fg = colors.black, bg = colors.blue },
-	-- 				b = { fg = colors.blue, bg = colors.grey },
-	-- 			},
-	-- 			visual = {
-	-- 				a = { fg = colors.black, bg = colors.cyan },
-	-- 				b = { fg = colors.cyan, bg = colors.grey },
-	-- 			},
-	-- 			replace = {
-	-- 				a = { bg = colors.red, fg = colors.black },
-	-- 				b = { bg = colors.fg_gutter, fg = colors.red },
-	-- 			},
-	-- 			command = {
-	-- 				a = { bg = colors.yellow, fg = colors.black },
-	-- 				b = { bg = colors.fg_gutter, fg = colors.yellow },
-	-- 			},
-	-- 			terminal = {
-	-- 				a = { bg = colors.green1, fg = colors.black },
-	-- 				b = { bg = colors.fg_gutter, fg = colors.green1 },
-	-- 			},
-	-- 			inactive = {
-	-- 				a = { fg = colors.white, bg = colors.black_transparant },
-	-- 				b = { fg = colors.white, bg = colors.black_transparant },
-	-- 				c = { fg = colors.black, bg = colors.black_transparant },
-	-- 			},
-	-- 		}
-	--
-	-- 		if set_theme == "auto" then
-	-- 			bubbles_theme = vim.fn.fnamemodify("auto", ":t")
-	-- 		end
-	--
-	-- 		require("lualine").setup({
-	-- 			options = {
-	-- 				theme = bubbles_theme,
-	-- 				-- theme = "auto",
-	-- 				component_separators = { left = "", right = "" },
-	-- 				section_separators = { left = "", right = "" },
-	-- 				disabled_filetypes = {
-	-- 					"TelescopePrompt",
-	-- 					"packer",
-	-- 					"alpha",
-	-- 					"dashboard",
-	-- 					"NvimTree",
-	-- 					"Outline",
-	-- 					"DressingInput",
-	-- 					"toggleterm",
-	-- 					"lazy",
-	-- 					"mason",
-	-- 					"neo-tree",
-	-- 					"startuptime",
-	-- 				},
-	-- 				always_divide_middle = true,
-	-- 			},
-	-- 			sections = {
-	-- 				lualine_a = {
-	-- 					mode,
-	-- 				},
-	-- 				lualine_b = { get_branch },
-	-- 				lualine_c = { lsp_info, diagnostics, lsp_progress },
-	-- 				lualine_x = { diff, spaces, "filetype" },
-	-- 				lualine_y = { "progress" },
-	-- 				lualine_z = {
-	-- 					{ "location", separator = { right = " " }, padding = 1 },
-	-- 				},
-	-- 			},
-	-- 			inactive_sections = {
-	-- 				lualine_a = { "filename" },
-	-- 				lualine_b = {},
-	-- 				lualine_c = {},
-	-- 				lualine_x = {},
-	-- 				lualine_y = {},
-	-- 				lualine_z = { "location" },
-	-- 			},
-	-- 			tabline = {},
-	-- 			extensions = {},
-	-- 		})
-	-- 	end,
-	-- },
+	{
+		"nvim-lualine/lualine.nvim",
+		event = "InsertEnter",
+		config = function()
+			local hide_in_width = function()
+				return vim.fn.winwidth(0) > 80
+			end
+			local icons = require("user.icons")
+
+			local getLeftSubstring = function(word, length)
+				if #word > length then
+					return string.sub(word, 1, length) .. "..."
+				else
+					return word
+				end
+			end
+
+			-- start for lsp
+			local list_registered_providers_names = function(filetype)
+				local s = require("null-ls.sources")
+				local available_sources = s.get_available(filetype)
+				local registered = {}
+				for _, source in ipairs(available_sources) do
+					for method in pairs(source.methods) do
+						registered[method] = registered[method] or {}
+						table.insert(registered[method], source.name)
+					end
+				end
+				return registered
+			end
+
+			local null_ls = require("null-ls")
+			-- for formatter
+			local list_registered = function(filetype)
+				local method = null_ls.methods.FORMATTING
+				local registered_providers = list_registered_providers_names(filetype)
+				return registered_providers[method] or {}
+			end
+
+			--- for linter
+			local alternative_methods = {
+				null_ls.methods.DIAGNOSTICS,
+				null_ls.methods.DIAGNOSTICS_ON_OPEN,
+				null_ls.methods.DIAGNOSTICS_ON_SAVE,
+			}
+
+			local linter_list_registered = function(filetype)
+				local registered_providers = list_registered_providers_names(filetype)
+				local providers_for_methods = vim.tbl_flatten(vim.tbl_map(function(m)
+					return registered_providers[m] or {}
+				end, alternative_methods))
+
+				return providers_for_methods
+			end
+			-- end for lsp
+
+			local lsp_info = {
+				function()
+					local msg = "LS Inactive"
+					local buf_ft = vim.bo.filetype
+					local clients = vim.lsp.get_active_clients()
+					-- start register
+					local buf_clients = vim.lsp.buf_get_clients()
+					local buf_client_names = {}
+					if next(buf_clients) == nil then
+						-- TODO: clean up this if statement
+						if type(msg) == "boolean" or #msg == 0 then
+							return "LS Inactive"
+						end
+						return msg
+					end
+					-- add client
+					for _, client in pairs(buf_clients) do
+						if client.name ~= "null-ls" and client.name ~= "copilot" then
+							table.insert(buf_client_names, client.name)
+						end
+					end
+					-- add formatter
+					local supported_formatters = list_registered(buf_ft)
+					vim.list_extend(buf_client_names, supported_formatters)
+					-- add linter
+					local supported_linters = linter_list_registered(buf_ft)
+					vim.list_extend(buf_client_names, supported_linters)
+					-- decomple
+					local unique_client_names = vim.fn.uniq(buf_client_names)
+					local msg = table.concat(unique_client_names, ", ")
+					return msg
+				end,
+				--icon = " ",
+				icon = icons.ui.Gear .. "",
+				padding = 1,
+			}
+
+			local diagnostics = {
+				"diagnostics",
+				sources = { "nvim_diagnostic" },
+				sections = { "error", "warn" },
+				-- symbols = { error = " ", warn = " " },
+				symbols = {
+					error = icons.diagnostics.BoldError .. " ",
+					warn = icons.diagnostics.BoldWarning .. " ",
+				},
+				colored = true,
+				update_in_insert = false,
+				always_visible = false,
+			}
+
+			local diff = {
+				"diff",
+				colored = true,
+				-- symbols = { added = " ", modified = " ", removed = " " }, -- changes diff symbols
+				symbols = {
+					added = icons.git.LineAdded .. " ",
+					modified = icons.git.LineModified .. " ",
+					removed = icons.git.LineRemoved .. " ",
+				}, -- changes diff symbols
+				cond = hide_in_width,
+			}
+
+			local spaces = function()
+				-- return " " .. vim.api.nvim_buf_get_option(0, "shiftwidth")
+				return icons.ui.Tab .. " " .. vim.api.nvim_buf_get_option(0, "shiftwidth")
+			end
+
+			local mode = {
+				"mode",
+				padding = 1,
+				separator = { left = " " },
+				-- right_padding = 3,
+				fmt = function(str)
+					return icons.ui.Neovim .. " " .. str
+				end,
+			}
+			local branch = {
+				"branch",
+				padding = 1,
+			}
+
+			local get_branch = function()
+				if vim.b.gitsigns_head ~= nil then
+					return icons.git.Branch2 .. " " .. getLeftSubstring(vim.b.gitsigns_head, 6)
+				else
+					return icons.git.Branch2 .. vim.fn.fnamemodify("", ":t")
+				end
+			end
+
+			local lsp_progress = {}
+			local data_ok, lspprogress = pcall(require, "lsp-progress")
+			if data_ok then
+				lsp_progress = lspprogress.progress
+			end
+	     -- stylua: ignore
+	     local colors = {
+	       blue              = '#50fa7b',
+	       cyan              = '#f1fa8c',
+	       black             = '#1a1b26',
+	       black_transparant = 'none',
+	       white             = '#c6c6c6',
+	       red               = "#ff757f",
+	       skyblue_1         = '#bd93f9',
+	       grey              = '#5f6a8e',
+	       yellow            = "#ffb86c",
+	       fg_gutter         = "#3b4261",
+	       green1            = "#bd93f9",
+	     }
+
+			-- check config for theme
+			local set_theme
+			local bubbles_theme = {}
+			local data_exists, config = pcall(require, "core.config")
+			if data_exists then
+				if config.colorscheme ~= nil then
+					local color = config.colorscheme
+					switch(color, {
+						["tokyonight"] = function()
+							set_theme = "auto"
+						end,
+						["tokyonight-night"] = function()
+							set_theme = "auto"
+						end,
+						["tokyonight-storm"] = function()
+							set_theme = "auto"
+						end,
+						["tokyonight-day"] = function()
+							set_theme = "auto"
+						end,
+						["tokyonight-moon"] = function()
+							set_theme = "auto"
+						end,
+						["dracula"] = function()
+							local clr = require("dracula").colors()
+							colors.blue = clr.green
+							colors.black = clr.black
+							colors.cyan = clr.yellow
+							set_theme = bubbles_theme
+						end,
+						default = function()
+							set_theme = "auto"
+						end,
+					})
+				end
+			end
+
+			bubbles_theme = {
+				normal = {
+					a = { fg = colors.black, bg = colors.skyblue_1 },
+					b = { fg = colors.white, bg = colors.grey },
+					c = { fg = colors.white, bg = colors.black_transparant },
+				},
+
+				insert = {
+					a = { fg = colors.black, bg = colors.blue },
+					b = { fg = colors.blue, bg = colors.grey },
+				},
+				visual = {
+					a = { fg = colors.black, bg = colors.cyan },
+					b = { fg = colors.cyan, bg = colors.grey },
+				},
+				replace = {
+					a = { bg = colors.red, fg = colors.black },
+					b = { bg = colors.fg_gutter, fg = colors.red },
+				},
+				command = {
+					a = { bg = colors.yellow, fg = colors.black },
+					b = { bg = colors.fg_gutter, fg = colors.yellow },
+				},
+				terminal = {
+					a = { bg = colors.green1, fg = colors.black },
+					b = { bg = colors.fg_gutter, fg = colors.green1 },
+				},
+				inactive = {
+					a = { fg = colors.white, bg = colors.black_transparant },
+					b = { fg = colors.white, bg = colors.black_transparant },
+					c = { fg = colors.black, bg = colors.black_transparant },
+				},
+			}
+
+			if set_theme == "auto" then
+				bubbles_theme = vim.fn.fnamemodify("auto", ":t")
+			end
+
+			require("lualine").setup({
+				options = {
+					theme = bubbles_theme,
+					-- theme = "auto",
+					component_separators = { left = "", right = "" },
+					section_separators = { left = "", right = "" },
+					disabled_filetypes = {
+						"TelescopePrompt",
+						"packer",
+						"alpha",
+						"dashboard",
+						"NvimTree",
+						"Outline",
+						"DressingInput",
+						"toggleterm",
+						"lazy",
+						"mason",
+						"neo-tree",
+						"startuptime",
+					},
+					always_divide_middle = true,
+				},
+				sections = {
+					lualine_a = {
+						mode,
+					},
+					lualine_b = { get_branch },
+					lualine_c = { lsp_info, diagnostics, lsp_progress },
+					lualine_x = { diff, spaces, "filetype" },
+					lualine_y = { "progress" },
+					lualine_z = {
+						{ "location", separator = { right = " " }, padding = 1 },
+					},
+				},
+				inactive_sections = {
+					lualine_a = { "filename" },
+					lualine_b = {},
+					lualine_c = {},
+					lualine_x = {},
+					lualine_y = {},
+					lualine_z = { "location" },
+				},
+				tabline = {},
+				extensions = {},
+			})
+		end,
+	},
 }
diff --git a/lua/custom/plugins/lualine_onedark.lua b/lua/custom/plugins/lualine_onedark.lua
index 29717e6..e8bcb54 100644
--- a/lua/custom/plugins/lualine_onedark.lua
+++ b/lua/custom/plugins/lualine_onedark.lua
@@ -1,248 +1,248 @@
 return {
-	{
-		"nvim-lualine/lualine.nvim",
-		event = "InsertEnter",
-		config = function()
-			local hide_in_width = function()
-				return vim.fn.winwidth(0) > 80
-			end
-			local icons = require("user.icons")
-
-			local getLeftSubstring = function(word, length)
-				if #word > length then
-					return string.sub(word, 1, length) .. "..."
-				else
-					return word
-				end
-			end
-
-			-- start for lsp
-			local list_registered_providers_names = function(filetype)
-				local s = require("null-ls.sources")
-				local available_sources = s.get_available(filetype)
-				local registered = {}
-				for _, source in ipairs(available_sources) do
-					for method in pairs(source.methods) do
-						registered[method] = registered[method] or {}
-						table.insert(registered[method], source.name)
-					end
-				end
-				return registered
-			end
-
-			local null_ls = require("null-ls")
-			-- for formatter
-			local list_registered = function(filetype)
-				local method = null_ls.methods.FORMATTING
-				local registered_providers = list_registered_providers_names(filetype)
-				return registered_providers[method] or {}
-			end
-
-			--- for linter
-			local alternative_methods = {
-				null_ls.methods.DIAGNOSTICS,
-				null_ls.methods.DIAGNOSTICS_ON_OPEN,
-				null_ls.methods.DIAGNOSTICS_ON_SAVE,
-			}
-
-			local linter_list_registered = function(filetype)
-				local registered_providers = list_registered_providers_names(filetype)
-				local providers_for_methods = vim.tbl_flatten(vim.tbl_map(function(m)
-					return registered_providers[m] or {}
-				end, alternative_methods))
-
-				return providers_for_methods
-			end
-			-- end for lsp
-
-			local lsp_info = {
-				function()
-					local msg = "LS Inactive"
-					local buf_ft = vim.bo.filetype
-					local clients = vim.lsp.get_active_clients()
-					-- start register
-					local buf_clients = vim.lsp.buf_get_clients()
-					local buf_client_names = {}
-					if next(buf_clients) == nil then
-						-- TODO: clean up this if statement
-						if type(msg) == "boolean" or #msg == 0 then
-							return "LS Inactive"
-						end
-						return msg
-					end
-					-- add client
-					for _, client in pairs(buf_clients) do
-						if client.name ~= "null-ls" and client.name ~= "copilot" then
-							table.insert(buf_client_names, client.name)
-						end
-					end
-					-- add formatter
-					local supported_formatters = list_registered(buf_ft)
-					vim.list_extend(buf_client_names, supported_formatters)
-					-- add linter
-					local supported_linters = linter_list_registered(buf_ft)
-					vim.list_extend(buf_client_names, supported_linters)
-					-- decomple
-					local unique_client_names = vim.fn.uniq(buf_client_names)
-					local msg = table.concat(unique_client_names, ", ")
-					return msg
-				end,
-				--icon = " ",
-				icon = icons.ui.Gear .. "",
-				padding = 1,
-			}
-
-			local diagnostics = {
-				"diagnostics",
-				sources = { "nvim_diagnostic" },
-				sections = { "error", "warn" },
-				-- symbols = { error = " ", warn = " " },
-				symbols = {
-					error = icons.diagnostics.BoldError .. " ",
-					warn = icons.diagnostics.BoldWarning .. " ",
-				},
-				colored = true,
-				update_in_insert = false,
-				always_visible = false,
-			}
-
-			local diff = {
-				"diff",
-				colored = true,
-				-- symbols = { added = " ", modified = " ", removed = " " }, -- changes diff symbols
-				symbols = {
-					added = icons.git.LineAdded .. " ",
-					modified = icons.git.LineModified .. " ",
-					removed = icons.git.LineRemoved .. " ",
-				}, -- changes diff symbols
-				cond = hide_in_width,
-			}
-
-			local spaces = function()
-				-- return " " .. vim.api.nvim_buf_get_option(0, "shiftwidth")
-				return icons.ui.Tab .. " " .. vim.api.nvim_buf_get_option(0, "shiftwidth")
-			end
-
-			local mode = {
-				"mode",
-				padding = 1,
-				separator = { left = " " },
-				-- right_padding = 3,
-				fmt = function(str)
-					return icons.ui.Neovim .. " " .. str
-				end,
-			}
-			local branch = {
-				"branch",
-				padding = 1,
-			}
-
-			local get_branch = function()
-				if vim.b.gitsigns_head ~= nil then
-					return icons.git.Branch2 .. " " .. getLeftSubstring(vim.b.gitsigns_head, 6)
-				else
-					return icons.git.Branch2 .. vim.fn.fnamemodify("", ":t")
-				end
-			end
-
-			local lsp_progress = {}
-			local data_ok, lspprogress = pcall(require, "lsp-progress")
-			if data_ok then
-				lsp_progress = lspprogress.progress
-			end
-	     -- stylua: ignore
-	    local onedark=vim.fn.fnamemodify("auto", ":t")
-			local is_transparat = true
-			local status_ok, onedarkpro = pcall(require, "onedarkpro.helpers")
-			if status_ok then
-				local colors = onedarkpro.get_colors("onedark")
-
-				onedark = {
-					normal = {
-						a = { bg = colors.green, fg = colors.bg },
-						b = { bg = colors.fg_gutter, fg = colors.green },
-						c = {
-							bg = is_transparat and colors.none or colors.bg_statusline,
-							fg = colors.fg,
-						},
-					},
-
-					insert = {
-						a = { bg = colors.blue, fg = colors.bg },
-						b = { bg = colors.fg_gutter, fg = colors.blue },
-					},
-					visual = {
-						a = { bg = colors.yellow, fg = colors.bg },
-						b = { bg = colors.fg_gutter, fg = colors.yellow },
-					},
-					replace = {
-						a = { bg = colors.red, fg = colors.bg },
-						b = { bg = colors.fg_gutter, fg = colors.red },
-					},
-					command = {
-						a = { bg = colors.purple, fg = colors.bg },
-						b = { bg = colors.fg_gutter, fg = colors.purple },
-					},
-					terminal = {
-						a = { bg = colors.cyan, fg = colors.bg },
-						b = { bg = colors.fg_gutter, fg = colors.cyan },
-					},
-					inactive = {
-						a = { bg = colors.bg, fg = colors.blue },
-						b = { bg = colors.bg, fg = colors.fg_gutter_inactive, gui = "bold" },
-						c = {
-							bg = is_transparat and colors.none or colors.bg,
-							fg = colors.fg_gutter_inactive,
-						},
-					},
-				}
-			end
-
-			require("lualine").setup({
-				options = {
-					theme = onedark,
-					-- theme = "auto",
-					component_separators = { left = "", right = "" },
-					section_separators = { left = "", right = "" },
-					disabled_filetypes = {
-						"TelescopePrompt",
-						"packer",
-						"alpha",
-						"dashboard",
-						"NvimTree",
-						"Outline",
-						"DressingInput",
-						"toggleterm",
-						"lazy",
-						"mason",
-						"neo-tree",
-						"startuptime",
-					},
-					always_divide_middle = true,
-				},
-				sections = {
-					lualine_a = {
-						mode,
-					},
-					lualine_b = { get_branch },
-					lualine_c = { lsp_info, diagnostics, lsp_progress },
-					lualine_x = { diff, spaces, "filetype" },
-					lualine_y = { "progress" },
-					lualine_z = {
-						{ "location", separator = { right = " " }, padding = 1 },
-					},
-				},
-				inactive_sections = {
-					lualine_a = { "filename" },
-					lualine_b = {},
-					lualine_c = {},
-					lualine_x = {},
-					lualine_y = {},
-					lualine_z = { "location" },
-				},
-				tabline = {},
-				extensions = {},
-			})
-		end,
-	},
+	-- {
+	-- 	"nvim-lualine/lualine.nvim",
+	-- 	event = "InsertEnter",
+	-- 	config = function()
+	-- 		local hide_in_width = function()
+	-- 			return vim.fn.winwidth(0) > 80
+	-- 		end
+	-- 		local icons = require("user.icons")
+	--
+	-- 		local getLeftSubstring = function(word, length)
+	-- 			if #word > length then
+	-- 				return string.sub(word, 1, length) .. "..."
+	-- 			else
+	-- 				return word
+	-- 			end
+	-- 		end
+	--
+	-- 		-- start for lsp
+	-- 		local list_registered_providers_names = function(filetype)
+	-- 			local s = require("null-ls.sources")
+	-- 			local available_sources = s.get_available(filetype)
+	-- 			local registered = {}
+	-- 			for _, source in ipairs(available_sources) do
+	-- 				for method in pairs(source.methods) do
+	-- 					registered[method] = registered[method] or {}
+	-- 					table.insert(registered[method], source.name)
+	-- 				end
+	-- 			end
+	-- 			return registered
+	-- 		end
+	--
+	-- 		local null_ls = require("null-ls")
+	-- 		-- for formatter
+	-- 		local list_registered = function(filetype)
+	-- 			local method = null_ls.methods.FORMATTING
+	-- 			local registered_providers = list_registered_providers_names(filetype)
+	-- 			return registered_providers[method] or {}
+	-- 		end
+	--
+	-- 		--- for linter
+	-- 		local alternative_methods = {
+	-- 			null_ls.methods.DIAGNOSTICS,
+	-- 			null_ls.methods.DIAGNOSTICS_ON_OPEN,
+	-- 			null_ls.methods.DIAGNOSTICS_ON_SAVE,
+	-- 		}
+	--
+	-- 		local linter_list_registered = function(filetype)
+	-- 			local registered_providers = list_registered_providers_names(filetype)
+	-- 			local providers_for_methods = vim.tbl_flatten(vim.tbl_map(function(m)
+	-- 				return registered_providers[m] or {}
+	-- 			end, alternative_methods))
+	--
+	-- 			return providers_for_methods
+	-- 		end
+	-- 		-- end for lsp
+	--
+	-- 		local lsp_info = {
+	-- 			function()
+	-- 				local msg = "LS Inactive"
+	-- 				local buf_ft = vim.bo.filetype
+	-- 				local clients = vim.lsp.get_active_clients()
+	-- 				-- start register
+	-- 				local buf_clients = vim.lsp.buf_get_clients()
+	-- 				local buf_client_names = {}
+	-- 				if next(buf_clients) == nil then
+	-- 					-- TODO: clean up this if statement
+	-- 					if type(msg) == "boolean" or #msg == 0 then
+	-- 						return "LS Inactive"
+	-- 					end
+	-- 					return msg
+	-- 				end
+	-- 				-- add client
+	-- 				for _, client in pairs(buf_clients) do
+	-- 					if client.name ~= "null-ls" and client.name ~= "copilot" then
+	-- 						table.insert(buf_client_names, client.name)
+	-- 					end
+	-- 				end
+	-- 				-- add formatter
+	-- 				local supported_formatters = list_registered(buf_ft)
+	-- 				vim.list_extend(buf_client_names, supported_formatters)
+	-- 				-- add linter
+	-- 				local supported_linters = linter_list_registered(buf_ft)
+	-- 				vim.list_extend(buf_client_names, supported_linters)
+	-- 				-- decomple
+	-- 				local unique_client_names = vim.fn.uniq(buf_client_names)
+	-- 				local msg = table.concat(unique_client_names, ", ")
+	-- 				return msg
+	-- 			end,
+	-- 			--icon = " ",
+	-- 			icon = icons.ui.Gear .. "",
+	-- 			padding = 1,
+	-- 		}
+	--
+	-- 		local diagnostics = {
+	-- 			"diagnostics",
+	-- 			sources = { "nvim_diagnostic" },
+	-- 			sections = { "error", "warn" },
+	-- 			-- symbols = { error = " ", warn = " " },
+	-- 			symbols = {
+	-- 				error = icons.diagnostics.BoldError .. " ",
+	-- 				warn = icons.diagnostics.BoldWarning .. " ",
+	-- 			},
+	-- 			colored = true,
+	-- 			update_in_insert = false,
+	-- 			always_visible = false,
+	-- 		}
+	--
+	-- 		local diff = {
+	-- 			"diff",
+	-- 			colored = true,
+	-- 			-- symbols = { added = " ", modified = " ", removed = " " }, -- changes diff symbols
+	-- 			symbols = {
+	-- 				added = icons.git.LineAdded .. " ",
+	-- 				modified = icons.git.LineModified .. " ",
+	-- 				removed = icons.git.LineRemoved .. " ",
+	-- 			}, -- changes diff symbols
+	-- 			cond = hide_in_width,
+	-- 		}
+	--
+	-- 		local spaces = function()
+	-- 			-- return " " .. vim.api.nvim_buf_get_option(0, "shiftwidth")
+	-- 			return icons.ui.Tab .. " " .. vim.api.nvim_buf_get_option(0, "shiftwidth")
+	-- 		end
+	--
+	-- 		local mode = {
+	-- 			"mode",
+	-- 			padding = 1,
+	-- 			separator = { left = " " },
+	-- 			-- right_padding = 3,
+	-- 			fmt = function(str)
+	-- 				return icons.ui.Neovim .. " " .. str
+	-- 			end,
+	-- 		}
+	-- 		local branch = {
+	-- 			"branch",
+	-- 			padding = 1,
+	-- 		}
+	--
+	-- 		local get_branch = function()
+	-- 			if vim.b.gitsigns_head ~= nil then
+	-- 				return icons.git.Branch2 .. " " .. getLeftSubstring(vim.b.gitsigns_head, 6)
+	-- 			else
+	-- 				return icons.git.Branch2 .. vim.fn.fnamemodify("", ":t")
+	-- 			end
+	-- 		end
+	--
+	-- 		local lsp_progress = {}
+	-- 		local data_ok, lspprogress = pcall(require, "lsp-progress")
+	-- 		if data_ok then
+	-- 			lsp_progress = lspprogress.progress
+	-- 		end
+	--      -- stylua: ignore
+	--     local onedark=vim.fn.fnamemodify("auto", ":t")
+	-- 		local is_transparat = true
+	-- 		local status_ok, onedarkpro = pcall(require, "onedarkpro.helpers")
+	-- 		if status_ok then
+	-- 			local colors = onedarkpro.get_colors("onedark")
+	--
+	-- 			onedark = {
+	-- 				normal = {
+	-- 					a = { bg = colors.green, fg = colors.bg },
+	-- 					b = { bg = colors.fg_gutter, fg = colors.green },
+	-- 					c = {
+	-- 						bg = is_transparat and colors.none or colors.bg_statusline,
+	-- 						fg = colors.fg,
+	-- 					},
+	-- 				},
+	--
+	-- 				insert = {
+	-- 					a = { bg = colors.blue, fg = colors.bg },
+	-- 					b = { bg = colors.fg_gutter, fg = colors.blue },
+	-- 				},
+	-- 				visual = {
+	-- 					a = { bg = colors.yellow, fg = colors.bg },
+	-- 					b = { bg = colors.fg_gutter, fg = colors.yellow },
+	-- 				},
+	-- 				replace = {
+	-- 					a = { bg = colors.red, fg = colors.bg },
+	-- 					b = { bg = colors.fg_gutter, fg = colors.red },
+	-- 				},
+	-- 				command = {
+	-- 					a = { bg = colors.purple, fg = colors.bg },
+	-- 					b = { bg = colors.fg_gutter, fg = colors.purple },
+	-- 				},
+	-- 				terminal = {
+	-- 					a = { bg = colors.cyan, fg = colors.bg },
+	-- 					b = { bg = colors.fg_gutter, fg = colors.cyan },
+	-- 				},
+	-- 				inactive = {
+	-- 					a = { bg = colors.bg, fg = colors.blue },
+	-- 					b = { bg = colors.bg, fg = colors.fg_gutter_inactive, gui = "bold" },
+	-- 					c = {
+	-- 						bg = is_transparat and colors.none or colors.bg,
+	-- 						fg = colors.fg_gutter_inactive,
+	-- 					},
+	-- 				},
+	-- 			}
+	-- 		end
+	--
+	-- 		require("lualine").setup({
+	-- 			options = {
+	-- 				theme = onedark,
+	-- 				-- theme = "auto",
+	-- 				component_separators = { left = "", right = "" },
+	-- 				section_separators = { left = "", right = "" },
+	-- 				disabled_filetypes = {
+	-- 					"TelescopePrompt",
+	-- 					"packer",
+	-- 					"alpha",
+	-- 					"dashboard",
+	-- 					"NvimTree",
+	-- 					"Outline",
+	-- 					"DressingInput",
+	-- 					"toggleterm",
+	-- 					"lazy",
+	-- 					"mason",
+	-- 					"neo-tree",
+	-- 					"startuptime",
+	-- 				},
+	-- 				always_divide_middle = true,
+	-- 			},
+	-- 			sections = {
+	-- 				lualine_a = {
+	-- 					mode,
+	-- 				},
+	-- 				lualine_b = { get_branch },
+	-- 				lualine_c = { lsp_info, diagnostics, lsp_progress },
+	-- 				lualine_x = { diff, spaces, "filetype" },
+	-- 				lualine_y = { "progress" },
+	-- 				lualine_z = {
+	-- 					{ "location", separator = { right = " " }, padding = 1 },
+	-- 				},
+	-- 			},
+	-- 			inactive_sections = {
+	-- 				lualine_a = { "filename" },
+	-- 				lualine_b = {},
+	-- 				lualine_c = {},
+	-- 				lualine_x = {},
+	-- 				lualine_y = {},
+	-- 				lualine_z = { "location" },
+	-- 			},
+	-- 			tabline = {},
+	-- 			extensions = {},
+	-- 		})
+	-- 	end,
+	-- },
 }
diff --git a/lua/custom/plugins/onedarkpro.lua b/lua/custom/plugins/onedarkpro.lua
index 25ebe90..b5470c7 100644
--- a/lua/custom/plugins/onedarkpro.lua
+++ b/lua/custom/plugins/onedarkpro.lua
@@ -1,125 +1,125 @@
 return {
-	{ "navarasu/onedark.nvim", enabled = false },
-	{
-		"olimorris/onedarkpro.nvim",
-		priority = 1000, -- Ensure it loads first
-		config = function()
-			local is_transparent = false
-			require("onedarkpro").setup({
-				styles = {
-					types = "NONE",
-					methods = "NONE",
-					numbers = "NONE",
-					strings = "NONE",
-					comments = "italic",
-					-- keywords = "bold,italic",
-					keywords = "italic",
-					constants = "NONE",
-					functions = "NONE",
-					operators = "NONE",
-					variables = "NONE",
-					parameters = "NONE",
-					conditionals = "italic",
-					virtual_text = "NONE",
-					tags = "italic",
-				},
-				colors = {
-					onedark = {
-						green = "#99c379",
-						gray = "#8094b4",
-						red = "#e06c75",
-						purple = "#c678dd",
-						yellow = "#e5c07a",
-						blue = "#61afef",
-						cyan = "#56b6c2",
-						bg_statusline = "#282c34",
-						indentline = "#3b4261",
-						float_bg = "#282c34",
-					},
-				},
-				filetypes = {
-					-- javascript = false,
-				},
-				options = {
-					cursorline = true, -- Use cursorline highlighting?
-					transparency = is_transparent, -- Use a transparent background?
-					terminal_colors = true, -- Use the theme's colors for Neovim's :terminal?
-					lualine_transparency = is_transparent, -- Center bar transparency?
-					highlight_inactive_windows = false, -- When the window is out of focus, change the normal background?
-				},
-				highlights = {
-					-- overide cursor line fill colors
-					LineNr = { fg = "#49505E" }, -- Line number for ":number" and ":#" commands, and when 'number' or 'relativenumber' option is set.
-					CursorLineNr = { fg = "${blue}" }, -- Like LineNr when 'cursorline' or 'relativenumber' is set for the cursor line.
-					CursorLine = { bg = "#333842" },
-					Cursor = { fg = "${bg}", bg = "${fg}" }, -- character under the cursor
-					lCursor = { fg = "${bg}", bg = "${fg}" }, -- the character under the cursor when |language-mapping| is used (see 'guicursor')
-					CursorIM = { fg = "${bg}", bg = "${fg}" }, -- like Cursor, but used when in IME mode |CursorIM|
-					CursorColumn = { bg = "#333842" }, -- Screen-column at the cursor, when 'cursorcolumn' is set.
-					-- overide nvimtree folder icon fill color
-					NvimTreeFolderIcon = { fg = "${gray}" },
-					-- overide nvimtree text fill color folder opened
-					NvimTreeOpenedFolderName = { fg = "${blue}" },
-					-- overide nvimtree text fill color root folder
-					NvimTreeRootFolder = { fg = "${blue}" },
-					NvimTreeSpecialFile = { fg = "${orange}" },
-					NvimTreeWinSeparator = { fg = "#202329" },
-					NvimTreeIndentMarker = { fg = "#3E4450" },
-					-- overide indenline fill color
-					IblIndent = { fg = "#3E4450" },
-					-- overide cmp cursorline fill color with #333842
-					PmenuSel = { bg = "#333842" },
-					illuminatedWord = { bg = "#3b4261" },
-					illuminatedCurWord = { bg = "#3b4261" },
-					IlluminatedWordText = { bg = "#3b4261" },
-					IlluminatedWordRead = { bg = "#3b4261" },
-					IlluminatedWordWrite = { bg = "#3b4261" },
-					StatusLine = { fg = "#f8f8f2", bg = is_transparent and "NONE" or "${bg}" },
-					StatusLineTerm = { fg = "#f8f8f2", bg = "${bg}" },
-					BufferLineFill = { bg = is_transparent and "NONE" or "${bg}" },
-					["@string.special.url.html"] = { fg = "${green}" },
-					["@text.uri.html"] = { fg = "${green}" },
-					["@tag.javascript"] = { fg = "${red}" },
-					["@tag.attribute"] = { fg = "${orange}", style = "italic" },
-					["@constructor.javascript"] = { fg = "${red}" },
-					-- ["@variable"] = { fg = "${fg}", style = "NONE" }, -- various variable names
-					["@variable.builtin"] = { fg = "${red}", style = "NONE" },
-					["@variable.member"] = "${cyan}",
-					["@variable.parameter"] = "${red}",
-					-- ["@property.javascript"] = { fg = "${cyan}" }, -- similar to `@field`
-					["@lsp.type.parameter"] = { fg = "${fg}" },
-					["@lsp.type.property.lua"] = { fg = "${red}" },
-					["@lsp.type.variable"] = { fg = "${fg}" },
-					NvimTreeGitDirty = { fg = "${yellow}" },
-					Pmenu = { fg = "${fg}", bg = "${bg}" },
-					PmenuThumb = { bg = "${gray}" }, -- Popup menu: Thumb of the scrollbar.
-					-- overide lualine fill color with bg color
-					LualineNormal = { bg = "${bg}" },
-					-- overide lualine_c fill color with bg color
-					LualineC = { bg = "${bg}" },
-					-- overide lualine_x fill color with bg color
-					LualineX = { bg = "${bg}" },
-					-- overide which-key fill color with bg color
-					-- WhichKey = { bg = "${bg}" },
-					-- -- overide which-key fill color with bg color
-					-- WhichKeySeperator = { bg = "${bg}" },
-					-- -- overide which-key fill color with bg color
-					-- WhichKeyDesc = { fg = "${red}" },
-					-- -- overide which-key fill color with bg color
-					-- WhichKeyFloat = { bg = "${bg}" },
-					WhichKeyFloat = { bg = is_transparent and "NONE" or "${bg}" },
-					-- -- overide which-key fill color with bg color
-					-- WhichKeyValue = { bg = "${bg}" },
-					-- -- overide which-key fill color with bg color
-					-- WhichKeyBorder = { bg = "${bg}" },
-					-- Folded = { bg = "NONE", fg = "${fg}" }, -- line used for closed folds
-					TermCursor = { bg = "${fg}" },
-					TSRainbowRed = { fg = "${cyan}" },
-					TSRainbowCyan = { fg = "${red}" },
-					NonText = { fg = "${fg}", bg = is_transparent and "NONE" or "#30333d" },
-					MiniIndentscopeSymbol = { fg = "${cyan}" },
-				},
-			})
-		end,
-	},
+	-- { "navarasu/onedark.nvim", enabled = false },
+	-- {
+	-- 	"olimorris/onedarkpro.nvim",
+	-- 	priority = 1000, -- Ensure it loads first
+	-- 	config = function()
+	-- 		local is_transparent = false
+	-- 		require("onedarkpro").setup({
+	-- 			styles = {
+	-- 				types = "NONE",
+	-- 				methods = "NONE",
+	-- 				numbers = "NONE",
+	-- 				strings = "NONE",
+	-- 				comments = "italic",
+	-- 				-- keywords = "bold,italic",
+	-- 				keywords = "italic",
+	-- 				constants = "NONE",
+	-- 				functions = "NONE",
+	-- 				operators = "NONE",
+	-- 				variables = "NONE",
+	-- 				parameters = "NONE",
+	-- 				conditionals = "italic",
+	-- 				virtual_text = "NONE",
+	-- 				tags = "italic",
+	-- 			},
+	-- 			colors = {
+	-- 				onedark = {
+	-- 					green = "#99c379",
+	-- 					gray = "#8094b4",
+	-- 					red = "#e06c75",
+	-- 					purple = "#c678dd",
+	-- 					yellow = "#e5c07a",
+	-- 					blue = "#61afef",
+	-- 					cyan = "#56b6c2",
+	-- 					bg_statusline = "#282c34",
+	-- 					indentline = "#3b4261",
+	-- 					float_bg = "#282c34",
+	-- 				},
+	-- 			},
+	-- 			filetypes = {
+	-- 				-- javascript = false,
+	-- 			},
+	-- 			options = {
+	-- 				cursorline = true, -- Use cursorline highlighting?
+	-- 				transparency = is_transparent, -- Use a transparent background?
+	-- 				terminal_colors = true, -- Use the theme's colors for Neovim's :terminal?
+	-- 				lualine_transparency = is_transparent, -- Center bar transparency?
+	-- 				highlight_inactive_windows = false, -- When the window is out of focus, change the normal background?
+	-- 			},
+	-- 			highlights = {
+	-- 				-- overide cursor line fill colors
+	-- 				LineNr = { fg = "#49505E" }, -- Line number for ":number" and ":#" commands, and when 'number' or 'relativenumber' option is set.
+	-- 				CursorLineNr = { fg = "${blue}" }, -- Like LineNr when 'cursorline' or 'relativenumber' is set for the cursor line.
+	-- 				CursorLine = { bg = "#333842" },
+	-- 				Cursor = { fg = "${bg}", bg = "${fg}" }, -- character under the cursor
+	-- 				lCursor = { fg = "${bg}", bg = "${fg}" }, -- the character under the cursor when |language-mapping| is used (see 'guicursor')
+	-- 				CursorIM = { fg = "${bg}", bg = "${fg}" }, -- like Cursor, but used when in IME mode |CursorIM|
+	-- 				CursorColumn = { bg = "#333842" }, -- Screen-column at the cursor, when 'cursorcolumn' is set.
+	-- 				-- overide nvimtree folder icon fill color
+	-- 				NvimTreeFolderIcon = { fg = "${gray}" },
+	-- 				-- overide nvimtree text fill color folder opened
+	-- 				NvimTreeOpenedFolderName = { fg = "${blue}" },
+	-- 				-- overide nvimtree text fill color root folder
+	-- 				NvimTreeRootFolder = { fg = "${blue}" },
+	-- 				NvimTreeSpecialFile = { fg = "${orange}" },
+	-- 				NvimTreeWinSeparator = { fg = "#202329" },
+	-- 				NvimTreeIndentMarker = { fg = "#3E4450" },
+	-- 				-- overide indenline fill color
+	-- 				IblIndent = { fg = "#3E4450" },
+	-- 				-- overide cmp cursorline fill color with #333842
+	-- 				PmenuSel = { bg = "#333842" },
+	-- 				illuminatedWord = { bg = "#3b4261" },
+	-- 				illuminatedCurWord = { bg = "#3b4261" },
+	-- 				IlluminatedWordText = { bg = "#3b4261" },
+	-- 				IlluminatedWordRead = { bg = "#3b4261" },
+	-- 				IlluminatedWordWrite = { bg = "#3b4261" },
+	-- 				StatusLine = { fg = "#f8f8f2", bg = is_transparent and "NONE" or "${bg}" },
+	-- 				StatusLineTerm = { fg = "#f8f8f2", bg = "${bg}" },
+	-- 				BufferLineFill = { bg = is_transparent and "NONE" or "${bg}" },
+	-- 				["@string.special.url.html"] = { fg = "${green}" },
+	-- 				["@text.uri.html"] = { fg = "${green}" },
+	-- 				["@tag.javascript"] = { fg = "${red}" },
+	-- 				["@tag.attribute"] = { fg = "${orange}", style = "italic" },
+	-- 				["@constructor.javascript"] = { fg = "${red}" },
+	-- 				-- ["@variable"] = { fg = "${fg}", style = "NONE" }, -- various variable names
+	-- 				["@variable.builtin"] = { fg = "${red}", style = "NONE" },
+	-- 				["@variable.member"] = "${cyan}",
+	-- 				["@variable.parameter"] = "${red}",
+	-- 				-- ["@property.javascript"] = { fg = "${cyan}" }, -- similar to `@field`
+	-- 				["@lsp.type.parameter"] = { fg = "${fg}" },
+	-- 				["@lsp.type.property.lua"] = { fg = "${red}" },
+	-- 				["@lsp.type.variable"] = { fg = "${fg}" },
+	-- 				NvimTreeGitDirty = { fg = "${yellow}" },
+	-- 				Pmenu = { fg = "${fg}", bg = "${bg}" },
+	-- 				PmenuThumb = { bg = "${gray}" }, -- Popup menu: Thumb of the scrollbar.
+	-- 				-- overide lualine fill color with bg color
+	-- 				LualineNormal = { bg = "${bg}" },
+	-- 				-- overide lualine_c fill color with bg color
+	-- 				LualineC = { bg = "${bg}" },
+	-- 				-- overide lualine_x fill color with bg color
+	-- 				LualineX = { bg = "${bg}" },
+	-- 				-- overide which-key fill color with bg color
+	-- 				-- WhichKey = { bg = "${bg}" },
+	-- 				-- -- overide which-key fill color with bg color
+	-- 				-- WhichKeySeperator = { bg = "${bg}" },
+	-- 				-- -- overide which-key fill color with bg color
+	-- 				-- WhichKeyDesc = { fg = "${red}" },
+	-- 				-- -- overide which-key fill color with bg color
+	-- 				-- WhichKeyFloat = { bg = "${bg}" },
+	-- 				WhichKeyFloat = { bg = is_transparent and "NONE" or "${bg}" },
+	-- 				-- -- overide which-key fill color with bg color
+	-- 				-- WhichKeyValue = { bg = "${bg}" },
+	-- 				-- -- overide which-key fill color with bg color
+	-- 				-- WhichKeyBorder = { bg = "${bg}" },
+	-- 				-- Folded = { bg = "NONE", fg = "${fg}" }, -- line used for closed folds
+	-- 				TermCursor = { bg = "${fg}" },
+	-- 				TSRainbowRed = { fg = "${cyan}" },
+	-- 				TSRainbowCyan = { fg = "${red}" },
+	-- 				NonText = { fg = "${fg}", bg = is_transparent and "NONE" or "#30333d" },
+	-- 				MiniIndentscopeSymbol = { fg = "${cyan}" },
+	-- 			},
+	-- 		})
+	-- 	end,
+	-- },
 }
diff --git a/lua/user/coderunner.lua b/lua/user/coderunner.lua
index 4c8d930..ae7d53f 100644
--- a/lua/user/coderunner.lua
+++ b/lua/user/coderunner.lua
@@ -10,7 +10,7 @@ local rfile = {
 	typescript = "ts-node $dir/$fileName", -- npm install -g ts-node
 	rust = "cd $dir && rustc $fileName && $dir/$fileNameWithoutExt",
 	-- cpp="gcc $fileName -lstdc++ -o $fileNameWithoutExt && $fileNameWithoutExt"
-	cpp = "g++ $fileName -o $fileNameWithoutExt && $dir/$fileNameWithoutExt",
+	cpp = "cd $dir && g++ $fileName -o $fileNameWithoutExt && $dir/$fileNameWithoutExt",
 	scss = "sass $dir/$fileName $dir/$fileNameWithoutExt.css",
 	javascript = 'node "$dir/$fileName"',
 }