diff --git a/lua/core/options.lua b/lua/core/options.lua
index 781ae4b..8a30841 100644
--- a/lua/core/options.lua
+++ b/lua/core/options.lua
@@ -4,7 +4,7 @@ vim.opt.cmdheight = 2
 vim.opt.completeopt = { "menu", "menuone", "noselect" }
 vim.opt.conceallevel = 0
 vim.opt.fileencoding = "utf-8"
-vim.o.background = "dark"
+vim.opt.background = "dark"
 vim.opt.hlsearch = true
 vim.opt.ignorecase = true
 vim.opt.mouse = "a"
@@ -42,6 +42,8 @@ vim.opt.foldlevel = 99
 vim.opt.foldlevelstart = -1
 vim.opt.foldenable = true
 vim.opt.fillchars = [[eob: ,fold: ,foldopen:,foldsep: ,foldclose:]]
+vim.opt.winbar = "%{%v:lua.require'plugins.configs.winbar'.get_winbar()%}"
+
 vim.cmd("set whichwrap+=<,>,[,],h,l")
 vim.cmd("set iskeyword+=-")
 vim.cmd("set formatoptions-=cro")
diff --git a/lua/plugins/configs/lualine.lua b/lua/plugins/configs/lualine.lua
index 54d56dd..a887ec3 100644
--- a/lua/plugins/configs/lualine.lua
+++ b/lua/plugins/configs/lualine.lua
@@ -1,5 +1,4 @@
 local lualine = require("lualine")
-local winbar = require("plugins.configs.winbar")
 
 lualine.setup({
 	options = {
@@ -8,9 +7,6 @@ lualine.setup({
 		section_separators = { left = "", right = "" },
 		disabled_filetypes = { "alpha", "neo-tree" },
 		always_divide_middle = true,
-		refresh = {
-			winbar = 50,
-		},
 		theme = "catppuccin",
 	},
 	sections = {
@@ -37,20 +33,4 @@ lualine.setup({
 		lualine_y = {},
 		lualine_z = { "tabs" },
 	},
-	winbar = {
-		lualine_a = {},
-		lualine_b = { winbar.get_fileicon() .. winbar.get_filename() },
-		lualine_c = { winbar.get_location },
-		lualine_x = {},
-		lualine_y = {},
-		lualine_z = {},
-	},
-	inactive_winbar = {
-		lualine_a = {},
-		lualine_b = {},
-		lualine_c = {},
-		lualine_x = {},
-		lualine_y = {},
-		lualine_z = {},
-	},
-})
+}
diff --git a/lua/plugins/configs/winbar.lua b/lua/plugins/configs/winbar.lua
index af3aa31..34ce6d3 100644
--- a/lua/plugins/configs/winbar.lua
+++ b/lua/plugins/configs/winbar.lua
@@ -3,6 +3,11 @@ local M = {}
 local navic = require("nvim-navic")
 local gps = require("nvim-gps")
 
+gps.setup()
+navic.setup({
+	highlight = true,
+})
+
 local function is_empty(s)
 	return s == nil or s == ""
 end
@@ -20,7 +25,7 @@ function M.get_location()
 	elseif not is_empty(gps_location) then
 		return "%#WinBarContext#" .. " " .. ">" .. " " .. gps_location .. "%*"
 	else
-		return ""
+		return "%#WinBarContext#" .. "%*"
 	end
 end
 
@@ -44,4 +49,8 @@ function M.get_fileicon()
 	return "%#WinBarContext#" .. "%#" .. hl_winbar_file_icon .. "#" .. file_icon .. " " .. "%*"
 end
 
+function M.get_winbar()
+	return "%#WinBarContext#" .. M.get_fileicon() .. M.get_filename() .. M.get_location() .. "%*"
+end
+
 return M