diff --git a/init.lua b/init.lua
index f790dbe..9f19978 100644
--- a/init.lua
+++ b/init.lua
@@ -7,7 +7,6 @@ require("user.notify")
 require("user.navic")
 require("user.cmp")
 require("user.lsp")
-require("user.colorscheme")
 require("user.telescope")
 require("user.treesitter")
 require("user.autopairs")
diff --git a/lua/user/bufferline.lua b/lua/user/bufferline.lua
index 4db41ff..777afa3 100644
--- a/lua/user/bufferline.lua
+++ b/lua/user/bufferline.lua
@@ -21,7 +21,7 @@ bufferline.setup({
 		tab_size = 21,
 		diagnostics = "nvim_lsp",
 		diagnostics_update_in_insert = true,
-		offsets = { { filetype = "NvimTree", text = "" } },
+		offsets = { { filetype = "NvimTree", text = "", padding = 1 } },
 		show_buffer_icons = true,
 		show_buffer_close_icons = true,
 		show_close_icon = true,
diff --git a/lua/user/colorscheme.lua b/lua/user/colorscheme.lua
deleted file mode 100644
index f42924d..0000000
--- a/lua/user/colorscheme.lua
+++ /dev/null
@@ -1,5 +0,0 @@
-vim.g.nord_italic = false
-vim.g.nord_contrast = true
-vim.g.nord_borders = true
-require("nord").set()
-require("lsp-colors").setup()
diff --git a/lua/user/lualine.lua b/lua/user/lualine.lua
index 0f3847e..1890cf6 100644
--- a/lua/user/lualine.lua
+++ b/lua/user/lualine.lua
@@ -6,7 +6,7 @@ end
 lualine.setup({
 	options = {
 		icons_enabled = true,
-		theme = "auto",
+		theme = "onenord",
 		component_separators = { left = "", right = "" },
 		section_separators = { left = "", right = "" },
 		disabled_filetypes = { "alpha", "NvimTree" },
@@ -28,7 +28,6 @@ lualine.setup({
 		lualine_y = {},
 		lualine_z = {},
 	},
-	tabline = {},
 	extensions = {
 		"nvim-tree",
 		"toggleterm",
diff --git a/lua/user/plugins.lua b/lua/user/plugins.lua
index b7ee76f..b8c4a5c 100644
--- a/lua/user/plugins.lua
+++ b/lua/user/plugins.lua
@@ -49,8 +49,19 @@ return packer.startup(function(use)
 	use("kevinhwang91/promise-async")
 
 	-- Themes
-	use("shaunsingh/nord.nvim")
-	use("folke/lsp-colors.nvim")
+	-- Theme
+	use({
+		"rmehri01/onenord.nvim",
+		config = function()
+			require("onenord").setup()
+		end,
+	})
+	use({
+		"folke/lsp-colors.nvim",
+		config = function()
+			require("lsp-colors").setup()
+		end,
+	})
 
 	-- Completion
 	use("hrsh7th/nvim-cmp")