diff --git a/lua/config/lazy.lua b/lua/config/lazy.lua
index f5ee74c..d7c046b 100644
--- a/lua/config/lazy.lua
+++ b/lua/config/lazy.lua
@@ -1,4 +1,3 @@
--- Bootstrap lazy.nvim
 local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim"
 if not (vim.uv or vim.loop).fs_stat(lazypath) then
   local lazyrepo = "https://github.com/folke/lazy.nvim.git"
@@ -15,21 +14,20 @@ if not (vim.uv or vim.loop).fs_stat(lazypath) then
 end
 vim.opt.rtp:prepend(lazypath)
 
--- Make sure to setup `mapleader` and `maplocalleader` before
--- loading lazy.nvim so that mappings are correct.
--- This is also a good place to setup other settings (vim.opt)
 vim.g.mapleader = " "
-vim.g.maplocalleader = "\\"
+vim.g.maplocalleader = " "
+
+require("config.maps")
+require("config.opts")
 
--- Setup lazy.nvim
 require("lazy").setup({
   spec = {
-    -- import your plugins
     { import = "plugins" },
   },
-  -- Configure any other settings here. See the documentation for more details.
-  -- colorscheme that will be used when installing plugins.
-  install = { colorscheme = { "habamax" } },
-  -- automatically check for plugin updates
+  install = { colorscheme = { "tokyonight" } },
   checker = { enabled = true },
 })
+
+vim.cmd[[colorscheme tokyonight]]
+
+require("bufferline").setup{}
diff --git a/lua/config/maps.lua b/lua/config/maps.lua
new file mode 100644
index 0000000..8648125
--- /dev/null
+++ b/lua/config/maps.lua
@@ -0,0 +1,3 @@
+local map = vim.keymap.set
+
+map("n", "<leader>e", "<cmd>NvimTreeToggle<CR>", { desc = "NvimTree" })
diff --git a/lua/config/opts.lua b/lua/config/opts.lua
new file mode 100644
index 0000000..a76c6c4
--- /dev/null
+++ b/lua/config/opts.lua
@@ -0,0 +1,7 @@
+vim.opt.termguicolors = true
+
+vim.opt.expandtab = true
+vim.opt.shiftwidth = 2
+vim.opt.tabstop = 2
+vim.opt.smartindent = true
+vim.opt.autoindent = true
diff --git a/lua/map.lua b/lua/map.lua
deleted file mode 100644
index e69de29..0000000
diff --git a/lua/plugins/format.lua b/lua/plugins/format.lua
new file mode 100644
index 0000000..d3babb6
--- /dev/null
+++ b/lua/plugins/format.lua
@@ -0,0 +1,15 @@
+return {
+{
+    'windwp/nvim-autopairs',
+    event = "InsertEnter",
+    config = true
+},
+{
+  "folke/ts-comments.nvim",
+  event = "VeryLazy",
+  opts = {},
+},
+  {
+    "hrsh7th/nvim-cmp",
+  }
+}
diff --git a/lua/plugins/nvim-tree.lua b/lua/plugins/nvim-tree.lua
index c436e8f..93604bb 100644
--- a/lua/plugins/nvim-tree.lua
+++ b/lua/plugins/nvim-tree.lua
@@ -1,6 +1,11 @@
 return {
-	{
-    "nvim-tree/nvim-tree.lua",
-    cmd = { "NvimTreeToggle", "NvimTreeFocus" },
-  }
+  "nvim-tree/nvim-tree.lua",
+  version = "*",
+  lazy = false,
+  dependencies = {
+    "nvim-tree/nvim-web-devicons",
+  },
+  config = function()
+    require("nvim-tree").setup {}
+  end,
 }
diff --git a/lua/plugins/theme.lua b/lua/plugins/theme.lua
new file mode 100644
index 0000000..d09388c
--- /dev/null
+++ b/lua/plugins/theme.lua
@@ -0,0 +1,13 @@
+return {
+	{
+	  "folke/tokyonight.nvim",
+	  lazy = false,
+	  priority = 1000,
+	  opts = {},
+	},
+	{
+    'akinsho/bufferline.nvim',
+    version = "*",
+    dependencies = 'nvim-tree/nvim-web-devicons'
+  }
+}
diff --git a/lua/plugins/which.lua b/lua/plugins/which.lua
new file mode 100644
index 0000000..08c5841
--- /dev/null
+++ b/lua/plugins/which.lua
@@ -0,0 +1,15 @@
+return {
+	{
+    "folke/which-key.nvim",
+    event = "VeryLazy",
+    keys = {
+      {
+        "<leader>?",
+        function()
+          require("which-key").show({ global = false })
+        end,
+        desc = "Buffer Local Keymaps (which-key)",
+      },
+    },
+  }
+}