diff --git a/lua/options.lua b/lua/options.lua
index eabf7cb..b9f508a 100644
--- a/lua/options.lua
+++ b/lua/options.lua
@@ -47,7 +47,7 @@ return {
         laststatus = 3, -- global statusline
     },
     ui = {
-        theme = "vscode",
+        theme = "catppuccin",
         border = "rounded",
         popup = {
             width = 0.6,
diff --git a/lua/plugins/barbar.lua b/lua/plugins/barbar.lua
index a4015e9..650104b 100644
--- a/lua/plugins/barbar.lua
+++ b/lua/plugins/barbar.lua
@@ -43,3 +43,4 @@ return {
         end,
     },
 }
+
diff --git a/lua/plugins/catppucchin.lua b/lua/plugins/catppucchin.lua
new file mode 100644
index 0000000..61cf4b0
--- /dev/null
+++ b/lua/plugins/catppucchin.lua
@@ -0,0 +1,25 @@
+return {
+    {
+        "catppuccin/nvim",
+        name = "catppuccin",
+        priority = 1000,
+        opts = {
+            flavour = "macchiato",
+            no_underline = true,
+            integrations = {
+                cmp = true,
+                gitsigns = true,
+                nvimtree = true,
+                treesitter = true,
+                notify = true,
+                barbar = true,
+                dropbar = {
+                    enabled = false,
+                    color_mode = false, -- enable color for kind's texts, not just kind's icons
+                },
+                mason = true,
+
+            }
+        }
+    }
+}
diff --git a/lua/plugins/lualine.lua b/lua/plugins/lualine.lua
index cdfb7e4..817af68 100644
--- a/lua/plugins/lualine.lua
+++ b/lua/plugins/lualine.lua
@@ -5,7 +5,7 @@ return {
             local options = require("options")
             return {
                 options = {
-                    theme = "auto",
+                    theme = options.ui.theme,
                     component_separators = { left = "", right = "" },
                     section_separators = { left = "", right = "" },
                     globalstatus = true,
@@ -79,16 +79,6 @@ return {
                         }
                     },
                     lualine_c = {
-                        {
-                            "filename",
-                            path = 4,
-                            symbols = {
-                                modified = "", -- Text to show when the file is modified.
-                                readonly = "", -- Text to show when the file is non-modifiable or readonly.
-                                unnamed = "", -- Text to show for unnamed buffers.
-                                newfile = "[New]", -- Text to show for newly created file before first write
-                            },
-                        },
                         {
                             "branch",
                             icon = "󰊤",
@@ -128,7 +118,18 @@ return {
                                     vim.cmd("TroubleToggle")
                                 end, 100)
                             end,
-                        }
+                        },
+                        '%=',
+                        {
+                            "filename",
+                            path = 4,
+                            symbols = {
+                                modified = "", -- Text to show when the file is modified.
+                                readonly = "", -- Text to show when the file is non-modifiable or readonly.
+                                unnamed = "", -- Text to show for unnamed buffers.
+                                newfile = "[New]", -- Text to show for newly created file before first write
+                            },
+                        },
                     },
                     lualine_x = {
                         {
diff --git a/lua/plugins/onedark.lua b/lua/plugins/onedark.lua
new file mode 100644
index 0000000..788d0be
--- /dev/null
+++ b/lua/plugins/onedark.lua
@@ -0,0 +1,20 @@
+return {
+    {
+        'olimorris/onedarkpro.nvim',
+        lazy = false,
+        priority = 1000,
+        opts = {
+            plugins = {
+                treesitter = true,
+                nvim_lsp = true,
+                nvim_tree = true,
+                barbar = true,
+                trouble = true,
+                diffview = true,
+            },
+            options = {
+                cursorline = true
+            }
+        }
+    }
+}
diff --git a/lua/plugins/winsep.lua b/lua/plugins/winsep.lua
new file mode 100644
index 0000000..6a0ae4b
--- /dev/null
+++ b/lua/plugins/winsep.lua
@@ -0,0 +1,11 @@
+return {
+    {
+        "nvim-zh/colorful-winsep.nvim",
+        config = true,
+        event = { "WinLeave" },
+        opts = {
+            smooth = true,
+            exponential_smoothing = false
+        }
+    }
+}