diff --git a/init.lua b/init.lua
index d419d36..3ed8003 100644
--- a/init.lua
+++ b/init.lua
@@ -93,6 +93,10 @@ vim.g.maplocalleader = ' '
 -- Set to true if you have a Nerd Font installed and selected in the terminal
 vim.g.have_nerd_font = true
 
+vim.opt.tabstop = 4
+vim.opt.shiftwidth = 4
+vim.opt.expandtab = true
+
 -- [[ Setting options ]]
 -- See `:help vim.o`
 -- NOTE: You can change these options as you wish!
@@ -876,7 +880,7 @@ require('lazy').setup({
     },
   },
 
-  { -- You can easily change to a different colorscheme.
+  --[[ { -- You can easily change to a different colorscheme.
     -- Change the name of the colorscheme plugin below, and then
     -- change the command in the config to whatever the name of that colorscheme is.
     --
@@ -896,7 +900,7 @@ require('lazy').setup({
       -- any other, such as 'tokyonight-storm', 'tokyonight-moon', or 'tokyonight-day'.
       vim.cmd.colorscheme 'tokyonight-night'
     end,
-  },
+  },--]]
 
   -- Highlight todo, notes, etc in comments
   { 'folke/todo-comments.nvim', event = 'VimEnter', dependencies = { 'nvim-lua/plenary.nvim' }, opts = { signs = false } },
@@ -977,14 +981,14 @@ require('lazy').setup({
   -- require 'kickstart.plugins.indent_line',
   -- require 'kickstart.plugins.lint',
   -- require 'kickstart.plugins.autopairs',
-  -- require 'kickstart.plugins.neo-tree',
+  require 'kickstart.plugins.neo-tree',
   -- require 'kickstart.plugins.gitsigns', -- adds gitsigns recommend keymaps
 
   -- NOTE: The import below can automatically add your own plugins, configuration, etc from `lua/custom/plugins/*.lua`
   --    This is the easiest way to modularize your config.
   --
   --  Uncomment the following line and add your plugins to `lua/custom/plugins/*.lua` to get going.
-  -- { import = 'custom.plugins' },
+  { import = 'custom.plugins' },
   --
   -- For additional information with loading, sourcing and examples see `:help lazy.nvim-🔌-plugin-spec`
   -- Or use telescope!
diff --git a/lazy-lock.json b/lazy-lock.json
new file mode 100644
index 0000000..9363aba
--- /dev/null
+++ b/lazy-lock.json
@@ -0,0 +1,32 @@
+{
+  "LuaSnip": { "branch": "master", "commit": "458560534a73f7f8d7a11a146c801db00b081df0" },
+  "blink.cmp": { "branch": "main", "commit": "bae4bae0eedd1fa55f34b685862e94a222d5c6f8" },
+  "catppuccin": { "branch": "main", "commit": "30fa4d122d9b22ad8b2e0ab1b533c8c26c4dde86" },
+  "conform.nvim": { "branch": "master", "commit": "b4aab989db276993ea5dcb78872be494ce546521" },
+  "everforest-nvim": { "branch": "main", "commit": "d2936185a6d266def29fd7b523d296384580ef08" },
+  "fidget.nvim": { "branch": "main", "commit": "4d5858bd4c471c895060e1b9f3575f1551184dc5" },
+  "gitsigns.nvim": { "branch": "main", "commit": "6e3c66548035e50db7bd8e360a29aec6620c3641" },
+  "guess-indent.nvim": { "branch": "main", "commit": "84a4987ff36798c2fc1169cbaff67960aed9776f" },
+  "kanso.nvim": { "branch": "main", "commit": "151dbc23fe890d09c26df11b1208dd8129dca012" },
+  "lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" },
+  "lazydev.nvim": { "branch": "main", "commit": "2367a6c0a01eb9edb0464731cc0fb61ed9ab9d2c" },
+  "mason-lspconfig.nvim": { "branch": "main", "commit": "5e085efe67fccb13372d54331d849219662a7e93" },
+  "mason-tool-installer.nvim": { "branch": "main", "commit": "517ef5994ef9d6b738322664d5fdd948f0fdeb46" },
+  "mason.nvim": { "branch": "main", "commit": "7dc4facca9702f95353d5a1f87daf23d78e31c2a" },
+  "mini.nvim": { "branch": "main", "commit": "6bf9eccaf2a5395b254bc031f9812cf163ca4187" },
+  "neo-tree.nvim": { "branch": "main", "commit": "f1deac7ecec88c28a250d890ba7bb35843e69cbd" },
+  "nui.nvim": { "branch": "main", "commit": "de740991c12411b663994b2860f1a4fd0937c130" },
+  "nvim-lspconfig": { "branch": "master", "commit": "c8b90ae5cbe21d547b342b05c9266dcb8ca0de8f" },
+  "nvim-treesitter": { "branch": "master", "commit": "42fc28ba918343ebfd5565147a42a26580579482" },
+  "nvim-web-devicons": { "branch": "master", "commit": "6e51ca170563330e063720449c21f43e27ca0bc1" },
+  "plenary.nvim": { "branch": "master", "commit": "b9fd5226c2f76c951fc8ed5923d85e4de065e509" },
+  "rose-pine": { "branch": "main", "commit": "293de9285831e06abda2e532cea70370ee027821" },
+  "telescope-fzf-native.nvim": { "branch": "main", "commit": "1f08ed60cafc8f6168b72b80be2b2ea149813e55" },
+  "telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" },
+  "telescope.nvim": { "branch": "master", "commit": "b4da76be54691e854d3e0e02c36b0245f945c2c7" },
+  "themery.nvim": { "branch": "main", "commit": "bfa58f4b279d21cb515b28023e1b68ec908584b2" },
+  "todo-comments.nvim": { "branch": "main", "commit": "304a8d204ee787d2544d8bc23cd38d2f929e7cc5" },
+  "tokyonight.nvim": { "branch": "main", "commit": "057ef5d260c1931f1dffd0f052c685dcd14100a3" },
+  "which-key.nvim": { "branch": "main", "commit": "370ec46f710e058c9c1646273e6b225acf47cbed" },
+  "zen-mode.nvim": { "branch": "main", "commit": "863f150ca321b3dd8aa1a2b69b5f411a220e144f" }
+}
diff --git a/lua/custom/plugins/colorscheme.lua b/lua/custom/plugins/colorscheme.lua
new file mode 100644
index 0000000..afbbfc0
--- /dev/null
+++ b/lua/custom/plugins/colorscheme.lua
@@ -0,0 +1,175 @@
+return {
+  {
+    'zaldih/themery.nvim',
+    lazy = false,
+    config = function()
+      require('themery').setup {
+        themes = {
+          { name = 'Rose pine', colorscheme = 'rose-pine' },
+          { name = 'Tokyonight-night', colorscheme = 'tokyonight-night' },
+          { name = 'Catppuccin Mocha', colorscheme = 'catppuccin-mocha' },
+          { name = 'Everforest', colorscheme = 'everforest' },
+          { name = 'Kanso', colorscheme = 'kanso-ink' },
+        },
+        livePreview = true,
+        makePersist = true,
+      }
+    end,
+    keys = {
+      { '<space>ut', '<cmd>Themery<cr>', mode = 'n', desc = 'Colorschemes' },
+    },
+  },
+  {
+    'asilvam133/rose-pine.nvim',
+    name = 'rose-pine',
+    lazy = false,
+    opts = {
+      styles = {
+        bold = true,
+        italic = false,
+        transparency = false,
+      },
+      highlight_groups = {
+        ['@function.builtin.lua'] = { italic = false },
+        ['@lsp.type.comment'] = { italic = true },
+        ['@lsp.typemod.function.defaultLibrary.lua'] = { italic = false },
+        Comment = { italic = true },
+        DiagnosticUnnecessary = { italic = false },
+        TabLine = { bg = 'none' },
+        TabLineSel = { bg = 'none' },
+        TabLineFill = { bg = 'none' },
+        ZenBg = { bg = 'none' },
+      },
+    },
+    config = function(_, opts)
+      require('rose-pine').setup(opts)
+    end,
+  },
+  {
+    'catppuccin/nvim',
+    name = 'catppuccin',
+    lazy = false,
+    priority = 1000,
+    opts = {
+      flavour = 'mocha',
+      transparent_background = false,
+      integrations = {
+        fidget = true,
+        harpoon = true,
+        noice = true,
+        native_lsp = {
+          enabled = true,
+          virtual_text = {
+            errors = { 'italic' },
+            hints = { 'italic' },
+            warnings = { 'italic' },
+            information = { 'italic' },
+          },
+          underlines = {
+            errors = { 'underline' },
+            hints = { 'underline' },
+            warnings = { 'underline' },
+            information = { 'underline' },
+          },
+          inlay_hints = {
+            background = true,
+          },
+        },
+        notify = true,
+        treesitter_context = true,
+        telescope = {
+          enabled = true,
+          style = 'nvchad',
+        },
+        lsp_trouble = true,
+      },
+      custom_highlights = function(_)
+        return {
+          ['@module'] = { style = {} },
+          Conditional = { style = {} },
+          TabLine = { bg = 'none' },
+          TabLineSel = { bg = 'none' },
+          TabLineFill = { bg = 'none' },
+          ZenBg = { bg = 'none' },
+        }
+      end,
+    },
+    config = function(_, opts)
+      require('catppuccin').setup(opts)
+    end,
+  },
+  {
+    'folke/tokyonight.nvim',
+    lazy = false,
+    priority = 1000,
+    opts = {
+      transparent = false,
+      styles = {
+        keywords = { italic = false },
+      },
+      on_highlights = function(hl, c)
+        local prompt = '#2d3149'
+        hl.TelescopeNormal = {
+          bg = c.bg_dark,
+          fg = c.fg_dark,
+        }
+        hl.TelescopeBorder = {
+          bg = c.bg_dark,
+          fg = c.bg_dark,
+        }
+        hl.TelescopePromptNormal = {
+          bg = prompt,
+        }
+        hl.TelescopePromptBorder = {
+          bg = prompt,
+          fg = prompt,
+        }
+        hl.TelescopePromptTitle = {
+          bg = prompt,
+          fg = prompt,
+        }
+        hl.TelescopePreviewTitle = {
+          bg = c.bg_dark,
+          fg = c.bg_dark,
+        }
+        hl.TelescopeResultsTitle = {
+          bg = c.bg_dark,
+          fg = c.bg_dark,
+        }
+        hl.CursorLineSign = {
+          fg = hl.Constant.fg,
+        }
+        hl.LineNr = {
+          fg = hl.Constant.fg,
+        }
+        hl.LineNrAbove = {
+          fg = '#737aa2',
+        }
+        hl.LineNrBelow = {
+          fg = '#737aa2',
+        }
+      end,
+    },
+  },
+  {
+    'neanias/everforest-nvim',
+    version = false,
+    lazy = false,
+    priority = 1000,
+    opts = {
+      background = 'hard',
+      transparent_background_level = 0,
+    },
+    config = function(_, opts)
+      require('everforest').setup(opts)
+    end,
+  },
+  {
+    'webhooked/kanso.nvim',
+    lazy = false,
+    priority = 1000,
+    opts = {
+      keywordStyle = { italic = false },
+    },
+  },
+}
diff --git a/lua/custom/plugins/conform.lua b/lua/custom/plugins/conform.lua
new file mode 100644
index 0000000..810091c
--- /dev/null
+++ b/lua/custom/plugins/conform.lua
@@ -0,0 +1,42 @@
+return {
+  'stevearc/conform.nvim',
+  cmd = { 'ConformInfo' },
+  opts = {
+    format = {
+      timeout_ms = 3000,
+      async = false,
+      quiet = false,
+    },
+    formatters_by_ft = {
+      c = { 'clang-format' },
+      cpp = { 'clang-format' },
+      html = { 'htmlbeautifier' },
+      lua = { 'stylua' },
+      go = { 'goimports', 'gofumpt' },
+      hcl = { 'packer_fmt' },
+      python = { 'black' },
+      sh = { 'shfmt' },
+      terraform = { 'terraform_fmt' },
+      ['terraform-vars'] = { 'terraform_fmt' },
+      tf = { 'terraform_fmt' },
+      toml = { 'taplo' },
+      yaml = { 'yamlfmt' },
+    },
+    formatters = {
+      ['clang-format'] = {
+        prepend_args = { '-style=file', '-fallback-style=LLVM' },
+      },
+      injected = { options = { ignore_errors = true } },
+    },
+  },
+  keys = {
+    {
+      '<leader>f',
+      function()
+        require('conform').format { async = true, lsp_fallback = true }
+      end,
+      mode = 'n',
+      desc = 'Conform format',
+    },
+  },
+}
diff --git a/lua/custom/plugins/zenmode.lua b/lua/custom/plugins/zenmode.lua
new file mode 100644
index 0000000..759085a
--- /dev/null
+++ b/lua/custom/plugins/zenmode.lua
@@ -0,0 +1,33 @@
+return {
+  'folke/zen-mode.nvim',
+  config = function()
+    vim.keymap.set('n', '<leader>zz', function()
+      require('zen-mode').setup {
+        window = {
+          width = 90,
+          options = {},
+        },
+      }
+      require('zen-mode').toggle()
+      vim.wo.wrap = false
+      vim.wo.number = true
+      vim.wo.rnu = true
+      ColorMyPencils()
+    end)
+
+    vim.keymap.set('n', '<leader>zZ', function()
+      require('zen-mode').setup {
+        window = {
+          width = 80,
+          options = {},
+        },
+      }
+      require('zen-mode').toggle()
+      vim.wo.wrap = false
+      vim.wo.number = false
+      vim.wo.rnu = false
+      vim.opt.colorcolumn = '0'
+      ColorMyPencils()
+    end)
+  end,
+}
diff --git a/lua/kickstart/plugins/colors.lua b/lua/kickstart/plugins/colors.lua
new file mode 100644
index 0000000..a564707
--- /dev/null
+++ b/lua/kickstart/plugins/colors.lua
@@ -0,0 +1 @@
+return {}