diff --git a/lua/.DS_Store b/lua/.DS_Store
new file mode 100644
index 00000000..ef04439a
Binary files /dev/null and b/lua/.DS_Store differ
diff --git a/lua/custom/.DS_Store b/lua/custom/.DS_Store
new file mode 100644
index 00000000..aa72e923
Binary files /dev/null and b/lua/custom/.DS_Store differ
diff --git a/lua/custom/plugins/autopairs.lua b/lua/custom/plugins/autopairs.lua
new file mode 100644
index 00000000..7cf6cd34
--- /dev/null
+++ b/lua/custom/plugins/autopairs.lua
@@ -0,0 +1,16 @@
+return {
+  "windwp/nvim-autopairs",
+  -- Optional dependency
+  dependencies = { 'hrsh7th/nvim-cmp' },
+  config = function()
+    require("nvim-autopairs").setup {}
+    -- If you want to automatically add `(` after selecting a function or method
+    local cmp_autopairs = require('nvim-autopairs.completion.cmp')
+    local cmp = require('cmp')
+    cmp.event:on(
+      'confirm_done',
+      cmp_autopairs.on_confirm_done()
+    )
+  end,
+}
+
diff --git a/lua/custom/plugins/filetree.lua b/lua/custom/plugins/filetree.lua
new file mode 100644
index 00000000..ef92c537
--- /dev/null
+++ b/lua/custom/plugins/filetree.lua
@@ -0,0 +1,19 @@
+return {
+  "nvim-neo-tree/neo-tree.nvim",
+  branch = "v3.x",
+  dependencies = {
+    "nvim-lua/plenary.nvim",
+    "nvim-tree/nvim-web-devicons", -- not strictly required, but recommended
+    "MunifTanjim/nui.nvim",
+  },
+  config = function()
+    require('neo-tree').setup({
+      auto_clean_after_session_restore = true,
+      filesystem = {
+        follow_current_file = {
+          enabled = true,
+        }
+      }
+    })
+  end,
+}
diff --git a/lua/custom/plugins/formatter.lua b/lua/custom/plugins/formatter.lua
new file mode 100644
index 00000000..311b5d5e
--- /dev/null
+++ b/lua/custom/plugins/formatter.lua
@@ -0,0 +1,78 @@
+return {
+  "mhartington/formatter.nvim",
+  config = function()
+    -- Utilities for creating configurations
+    local util = require "formatter.util"
+    -- Provides the Format, FormatWrite, FormatLock, and FormatWriteLock commands
+    require("formatter").setup {
+      -- Enable or disable logging
+      logging = true,
+      -- Set the log level
+      log_level = vim.log.levels.WARN,
+      -- All formatter configurations are opt-in
+      filetype = {
+        css = {
+          require("formatter.filetypes.css").prettier,
+        },
+        go = {
+          require("formatter.filetypes.go").gofmt(),
+        },
+        html = {
+          require("formatter.filetypes.html").prettier
+        },
+        js = {
+          require("formatter.filetypes.javascript").prettier,
+        },
+        jsx = {
+          require("formatter.filetypes.javascriptreact").prettier,
+        },
+        -- Formatter configurations for filetype "lua" go here
+        -- and will be executed in order
+        lua = {
+          -- "formatter.filetypes.lua" defines default configurations for the
+          -- "lua" filetype
+          require("formatter.filetypes.lua").stylua,
+
+          -- You can also define your own configuration
+          function()
+            -- Supports conditional formatting
+            if util.get_current_buffer_file_name() == "special.lua" then
+              return nil
+            end
+
+            -- Full specification of configurations is down below and in Vim help
+            -- files
+            return {
+              exe = "stylua",
+              args = {
+                "--search-parent-directories",
+                "--stdin-filepath",
+                util.escape_path(util.get_current_buffer_file_path()),
+                "--",
+                "-",
+              },
+              stdin = true,
+            }
+          end
+        },
+        md = {
+          require("formatter.filetypes.markdown").prettier
+        },
+        ts = {
+          require("formatter.filetypes.typescript").prettier
+        },
+        tsx = {
+          require("formatter.filetypes.typescriptreact").prettier
+        },
+
+        -- Use the special "*" filetype for defining formatter configurations on
+        -- any filetype
+        ["*"] = {
+          -- "formatter.filetypes.any" defines default configurations for any
+          -- filetype
+          require("formatter.filetypes.any").remove_trailing_whitespace
+        }
+      }
+    }
+  end
+}
diff --git a/lua/custom/plugins/neotree.lua b/lua/custom/plugins/neotree.lua
deleted file mode 100644
index 3455cae5..00000000
--- a/lua/custom/plugins/neotree.lua
+++ /dev/null
@@ -1,13 +0,0 @@
-return {
-    "nvim-neo-tree/neo-tree.nvim",
-    version = "*",
-    dependencies = {
-      "nvim-lua/plenary.nvim",
-      "nvim-tree/nvim-web-devicons", -- not strictly required, but recommended
-      "MunifTanjim/nui.nvim",
-      -- "3rd/image.nvim", -- Optional image support in preview window: See `# Preview Mode` for more information
-    },
-    config = function ()
-       require('neo-tree').setup {}
-    end,
-}
diff --git a/lua/custom/plugins/trouble.lua b/lua/custom/plugins/trouble.lua
new file mode 100644
index 00000000..7e92648b
--- /dev/null
+++ b/lua/custom/plugins/trouble.lua
@@ -0,0 +1,9 @@
+return {
+ "folke/trouble.nvim",
+ dependencies = { "nvim-tree/nvim-web-devicons" },
+ opts = {
+  -- your configuration comes here
+  -- or leave it empty to use the default settings
+  -- refer to the configuration section below
+ },
+}
diff --git a/lua/kickstart/.DS_Store b/lua/kickstart/.DS_Store
new file mode 100644
index 00000000..00563b0d
Binary files /dev/null and b/lua/kickstart/.DS_Store differ