diff --git a/lua/config/lazy.lua b/lua/config/lazy.lua
index 0a7726f..2e56c20 100644
--- a/lua/config/lazy.lua
+++ b/lua/config/lazy.lua
@@ -1,150 +1,141 @@
 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"
-  local out = vim.fn.system({ "git", "clone", "--filter=blob:none", "--branch=stable", lazyrepo, lazypath })
-  if vim.v.shell_error ~= 0 then
-    vim.api.nvim_echo({
-      { "Failed to clone lazy.nvim:\n", "ErrorMsg" },
-      { out, "WarningMsg" },
-      { "\nPress any key to exit..." },
-    }, true, {})
-    vim.fn.getchar()
-    os.exit(1)
-  end
+	local lazyrepo = "https://github.com/folke/lazy.nvim.git"
+	local out = vim.fn.system({ "git", "clone", "--filter=blob:none", "--branch=stable", lazyrepo, lazypath })
+	if vim.v.shell_error ~= 0 then
+		vim.api.nvim_echo({
+			{ "Failed to clone lazy.nvim:\n", "ErrorMsg" },
+			{ out, "WarningMsg" },
+			{ "\nPress any key to exit..." },
+		}, true, {})
+		vim.fn.getchar()
+		os.exit(1)
+	end
 end
 vim.opt.rtp:prepend(lazypath)
 
 if not vim.g.vscode then
-  require("lazy").setup({
-    spec = {
-      -- add LazyVim and import its plugins
-      { "LazyVim/LazyVim", import = "lazyvim.plugins" },
-      -- import/override with your plugins
-      { import = "plugins" },
-    },
-    defaults = {
-      -- By default, only LazyVim plugins will be lazy-loaded. Your custom plugins will load during startup.
-      -- If you know what you're doing, you can set this to `true` to have all your custom plugins lazy-loaded by default.
-      lazy = false,
-      -- It's recommended to leave version=false for now, since a lot the plugin that support versioning,
-      -- have outdated releases, which may break your Neovim install.
-      version = false, -- always use the latest git commit
-      -- version = "*", -- try installing the latest stable version for plugins that support semver
-    },
-    install = { colorscheme = { "tokyonight", "habamax" } },
-    checker = {
-      enabled = true, -- check for plugin updates periodically
-      notify = false, -- notify on update
-    }, -- automatically check for plugin updates
-    performance = {
-      rtp = {
-        -- disable some rtp plugins
-        disabled_plugins = {
-          "gzip",
-          -- "matchit",
-          -- "matchparen",
-          -- "netrwPlugin",
-          "tarPlugin",
-          "tohtml",
-          "tutor",
-          "zipPlugin",
-        },
-      },
-    },
-  })
+	require("lazy").setup({
+		spec = {
+			-- add LazyVim and import its plugins
+			{ "LazyVim/LazyVim", import = "lazyvim.plugins" },
+			-- import/override with your plugins
+			{ import = "plugins" },
+		},
+		defaults = {
+			-- By default, only LazyVim plugins will be lazy-loaded. Your custom plugins will load during startup.
+			-- If you know what you're doing, you can set this to `true` to have all your custom plugins lazy-loaded by default.
+			lazy = false,
+			-- It's recommended to leave version=false for now, since a lot the plugin that support versioning,
+			-- have outdated releases, which may break your Neovim install.
+			version = false, -- always use the latest git commit
+			-- version = "*", -- try installing the latest stable version for plugins that support semver
+		},
+		install = { colorscheme = { "tokyonight", "habamax" } },
+		checker = {
+			enabled = true, -- check for plugin updates periodically
+			notify = false, -- notify on update
+		}, -- automatically check for plugin updates
+		performance = {
+			rtp = {
+				-- disable some rtp plugins
+				disabled_plugins = {
+					"gzip",
+					-- "matchit",
+					-- "matchparen",
+					-- "netrwPlugin",
+					"tarPlugin",
+					"tohtml",
+					"tutor",
+					"zipPlugin",
+				},
+			},
+		},
+	})
 else
-  -- 1.options
-  -- Hint: use `:h <option>` to figure out the meaning if needed
-  vim.opt.clipboard = 'unnamedplus'   -- use system clipboard 
-  vim.opt.completeopt = {'menu', 'menuone', 'noselect'}
-  vim.opt.mouse = 'a'                 -- allow the mouse to be used in Nvim
+	-- 1.options
+	-- Hint: use `:h <option>` to figure out the meaning if needed
+	vim.opt.clipboard = "unnamedplus" -- use system clipboard
+	vim.opt.completeopt = { "menu", "menuone", "noselect" }
+	vim.opt.mouse = "a" -- allow the mouse to be used in Nvim
 
-  -- Searching
-  vim.opt.incsearch = true            -- search as characters are entered
-  vim.opt.hlsearch = true            -- do not highlight matches
-  vim.opt.ignorecase = true           -- ignore case in searches by default
-  vim.opt.smartcase = true            -- but make it case sensitive if an uppercase is entered
+	-- Searching
+	vim.opt.incsearch = true -- search as characters are entered
+	vim.opt.hlsearch = true -- do not highlight matches
+	vim.opt.ignorecase = true -- ignore case in searches by default
+	vim.opt.smartcase = true -- but make it case sensitive if an uppercase is entered
 
-  -- Tab
-  vim.opt.tabstop = 4                 -- number of visual spaces per TAB
-  vim.opt.softtabstop = 4             -- number of spacesin tab when editing
-  vim.opt.shiftwidth = 4              -- insert 4 spaces on a tab
-  vim.opt.expandtab = true            -- tabs are spaces, mainly because of python
+	-- Tab
+	-- vim.opt.tabstop = 4 -- number of visual spaces per TAB
+	-- vim.opt.softtabstop = 4 -- number of spacesin tab when editing
+	-- vim.opt.shiftwidth = 4 -- insert 4 spaces on a tab
+	-- vim.opt.expandtab = true -- tabs are spaces, mainly because of python
 
-  -- UI config
-  vim.opt.number = true               -- show absolute number
-  vim.opt.relativenumber = true       -- add numbers to each line on the left side
-  vim.opt.cursorline = true           -- highlight cursor line underneath the cursor horizontally
-  vim.opt.splitbelow = true           -- open new vertical split bottom
-  vim.opt.splitright = true           -- open new horizontal splits right
-  vim.opt.termguicolors = true        -- enabl 24-bit RGB color in the TUI
-  vim.opt.showmode = false            -- we are experienced, wo don't need the "-- INSERT --" mode hint
+	-- UI config
+	-- vim.opt.number = true -- show absolute number
+	-- vim.opt.relativenumber = true -- add numbers to each line on the left side
+	-- vim.opt.cursorline = true -- highlight cursor line underneath the cursor horizontally
+	-- vim.opt.splitbelow = true -- open new vertical split bottom
+	-- vim.opt.splitright = true -- open new horizontal splits right
+	-- vim.opt.termguicolors = true -- enabl 24-bit RGB color in the TUI
+	-- vim.opt.showmode = false -- we are experienced, wo don't need the "-- INSERT --" mode hint
 
-  vim.opt.wrap = false          -- Wrapping sucks (except on markdown)
-  vim.opt.swapfile = false      -- Do not leave any backup files
-  vim.opt.showmatch  = true     -- Highlights the matching parenthesis
-  vim.opt.signcolumn = "yes"    -- Always show the signcolumn, otherwise it would shift the text
-  vim.opt.hidden = true         -- Allow multple buffers
-  vim.opt.shortmess:append("c") -- Don't pass messages to |ins-completion-menu|.
-  vim.opt.encoding = "utf-8"    -- Just in case
-  vim.opt.cmdheight = 2           -- Shows better messages
+	-- vim.opt.wrap = false -- Wrapping sucks (except on markdown)
+	-- vim.opt.swapfile = false -- Do not leave any backup files
+	-- vim.opt.showmatch = true -- Highlights the matching parenthesis
+	-- vim.opt.signcolumn = "yes" -- Always show the signcolumn, otherwise it would shift the text
+	-- vim.opt.hidden = true -- Allow multple buffers
+	-- vim.opt.shortmess:append("c") -- Don't pass messages to |ins-completion-menu|.
+	-- vim.opt.encoding = "utf-8" -- Just in case
+	-- vim.opt.cmdheight = 2 -- Shows better messages
 
-  vim.opt.foldmethod = "indent"
-  vim.opt.foldlevel = 99
+	-- vim.opt.foldmethod = "indent"
+	-- vim.opt.foldlevel = 99
 
-  vim.opt.swapfile = false
-  vim.opt.backup = false
-  vim.opt.undofile = false
-  vim.opt.writebackup = false
+	-- vim.opt.swapfile = false
+	-- vim.opt.backup = false
+	-- vim.opt.undofile = false
+	-- vim.opt.writebackup = false
 
-  vim.g.mapleader = " "            -- set leader key to space
-  vim.g.maplocalleader = " "        -- set local leader key to space
+	vim.g.mapleader = " " -- set leader key to space
+	vim.g.maplocalleader = " " -- set local leader key to space
 
-  if vim.loop.os_uname().sysname == "Windows_NT" then -- set default shell to powershell on Windows
-    vim.opt.shell = "powershell.exe"
-    vim.opt.shellcmdflag = "-Command"
-    vim.opt.shellquote = ""
-    vim.opt.shellxquote = ""
-    vim.opt.shellredir = "2>&1 | Out-File -Encoding ASCII %s; exit $LastExitCode"
-    vim.opt.shellpipe = "2>&1 | Out-File -Encoding ASCII %s; exit $LastExitCode"
-  end
+	local fold = {
+		unfoldAll = function()
+			vim.fn.VSCodeNotify("editor.unfoldAll")
+		end,
+		foldAll = function()
+			vim.fn.VSCodeNotify("editor.foldAll")
+		end,
+		fold = function()
+			vim.fn.VSCodeNotify("editor.fold")
+		end,
+		unfold = function()
+			vim.fn.VSCodeNotify("editor.unfold")
+		end,
+	}
+	vim.keymap.set("n", "zR", fold.unfoldAll)
+	vim.keymap.set("n", "zM", fold.foldAll)
+	vim.keymap.set("n", "zo", fold.unfold)
+	vim.keymap.set("n", "zc", fold.fold)
 
-  local fold = {
-    unfoldAll = function()
-      vim.fn.VSCodeNotify("editor.unfoldAll")
-    end,
-    foldAll = function()
-      vim.fn.VSCodeNotify("editor.foldAll")
-    end,
-    fold = function()
-      vim.fn.VSCodeNotify("editor.fold")
-    end,
-    unfold = function()
-      vim.fn.VSCodeNotify("editor.unfold")
-    end,
-  }
-  vim.keymap.set("n", "zR", fold.unfoldAll)
-  vim.keymap.set("n", "zM", fold.foldAll)
-  vim.keymap.set("n", "zo", fold.unfold)
-  vim.keymap.set("n", "zc", fold.fold)
+	local codeReader = {
+		quickInfo = function()
+			vim.fn.VSCodeNotify("editor.action.showHover")
+		end,
+	}
 
-  local codeReader = {
-    quickInfo = function()
-      vim.fn.VSCodeNotify("editor.action.showHover")
-    end,
-  }
+	vim.keymap.set("n", "<c-h>", codeReader.quickInfo)
 
-  vim.keymap.set("n", "<c-h>", codeReader.quickInfo)
-
-  require("lazy").setup({
-    spec = {
-      -- import your plugins
-      { import = "vscodeplugins" },
-    },
-    -- 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
-    checker = { enabled = true },
-  })
+	require("lazy").setup({
+		spec = {
+			-- import your plugins
+			{ import = "vscodeplugins" },
+		},
+		-- 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
+		checker = { enabled = true },
+	})
 end
diff --git a/lua/config/options.lua b/lua/config/options.lua
index 3ea1454..349c58d 100644
--- a/lua/config/options.lua
+++ b/lua/config/options.lua
@@ -1,3 +1,18 @@
 -- Options are automatically loaded before lazy.nvim startup
 -- Default options that are always set: https://github.com/LazyVim/LazyVim/blob/main/lua/lazyvim/config/options.lua
 -- Add any additional options here
+
+if vim.loop.os_uname().sysname == "Windows_NT" then -- set default shell to powershell on Windows
+    vim.opt.shell = "powershell.exe"
+    vim.opt.shellcmdflag = "-Command"
+    vim.opt.shellquote = ""
+    vim.opt.shellxquote = ""
+    vim.opt.shellredir = "2>&1 | Out-File -Encoding ASCII %s; exit $LastExitCode"
+    vim.opt.shellpipe = "2>&1 | Out-File -Encoding ASCII %s; exit $LastExitCode"
+end
+
+-- Tab
+vim.opt.tabstop = 4                 -- number of visual spaces per TAB
+vim.opt.softtabstop = 4             -- number of spacesin tab when editing
+vim.opt.shiftwidth = 4              -- insert 4 spaces on a tab
+vim.opt.expandtab = true            -- tabs are spaces, mainly because of python
diff --git a/lua/plugins/flash.lua b/lua/plugins/flash.lua
index d3d40f6..c898f75 100644
--- a/lua/plugins/flash.lua
+++ b/lua/plugins/flash.lua
@@ -1,17 +1,19 @@
-return{
+return {
     {
         "folke/flash.nvim",
         event = "VeryLazy",
         ---@type Flash.Config
         opts = {},
-        modes = {search = {enabled = true}},
+        modes = { search = { enabled = true } },
         -- stylua: ignore
         keys = {
-          { "<leader>j", mode = { "n", "x", "o" }, function() require("flash").jump() end, desc = "Flash" },
-          { "<leader>J", mode = { "n", "x", "o" }, function() require("flash").treesitter() end, desc = "Flash Treesitter" },
-          -- { "<leader>r", mode = "o", function() require("flash").remote() end, desc = "Remote Flash" },
-          -- { "<leader>R", mode = { "o", "x" }, function() require("flash").treesitter_search() end, desc = "Treesitter Search" },
-          -- { "<c-s>", mode = { "c" }, function() require("flash").toggle() end, desc = "Toggle Flash Search" },
+            { "s",         mode = { "n", "x", "o" }, false },
+            { "S",         mode = { "n", "o", "x" }, false },
+            { "r",         mode = "o",               false },
+            { "R",         mode = { "o", "x" },      false },
+            { "<c-s>",     mode = { "c" },           false },
+            { "<leader>j", mode = { "n", "x", "o" }, function() require("flash").jump() end,       desc = "Flash" },
+            { "<leader>J", mode = { "n", "x", "o" }, function() require("flash").treesitter() end, desc = "Flash Treesitter" },
         },
-      }
+    }
 }
diff --git a/lua/plugins/nvim-surround.lua b/lua/plugins/nvim-surround.lua
index 3baf897..07ac252 100644
--- a/lua/plugins/nvim-surround.lua
+++ b/lua/plugins/nvim-surround.lua
@@ -1,12 +1,12 @@
 return {
-  {
-    "kylechui/nvim-surround",
-    version = "^3.0.0", -- Use for stability; omit to use `main` branch for the latest features
-    event = "VeryLazy",
-    config = function()
-      require("nvim-surround").setup({
-        -- Configuration here, or leave empty to use defaults
-      })
-    end,
-  },
+    {
+        "kylechui/nvim-surround",
+        version = "^3.0.0", -- Use for stability; omit to use `main` branch for the latest features
+        event = "VeryLazy",
+        config = function()
+            require("nvim-surround").setup({
+                -- Configuration here, or leave empty to use defaults
+            })
+        end,
+    },
 }
diff --git a/lua/plugins/tree.lua b/lua/plugins/tree.lua
index b6c6abb..fc45143 100644
--- a/lua/plugins/tree.lua
+++ b/lua/plugins/tree.lua
@@ -1,14 +1,14 @@
 return {
---[[   {"vim-neo-tree/neo-tree.nvim", enabled = false},
-  {
-    "nvim-tree/nvim-tree.lua",
-    version = "*",
-    lazy = false,
-    dependencies = {
-      "nvim-tree/nvim-web-devicons",
-    },
-    config = function()
-      require("nvim-tree").setup {}
-    end,
-  } ]]
-}
\ No newline at end of file
+    -- { "vim-neo-tree/neo-tree.nvim", enabled = false },
+    -- {
+    --     "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/vscodeplugins/vscode.lua b/lua/vscodeplugins/vscode.lua
index 66aa41a..4bd3067 100644
--- a/lua/vscodeplugins/vscode.lua
+++ b/lua/vscodeplugins/vscode.lua
@@ -1,27 +1,27 @@
 return {
-  {
-    "folke/flash.nvim",
-    event = "VeryLazy",
-    ---@type Flash.Config
-    opts = {},
-    modes = { search = { enabled = true } },
-    -- stylua: ignore
-    keys = {
-      { "<leader>j", mode = { "n", "x", "o" }, function() require("flash").jump() end, desc = "Flash" },
-      { "<leader>J", mode = { "n", "x", "o" }, function() require("flash").treesitter() end, desc = "Flash Treesitter" },
-      -- { "<leader>r", mode = "o", function() require("flash").remote() end, desc = "Remote Flash" },
-      -- { "<leader>R", mode = { "o", "x" }, function() require("flash").treesitter_search() end, desc = "Treesitter Search" },
-      -- { "<c-s>", mode = { "c" }, function() require("flash").toggle() end, desc = "Toggle Flash Search" },
+    {
+        "folke/flash.nvim",
+        event = "VeryLazy",
+        ---@type Flash.Config
+        opts = {},
+        modes = { search = { enabled = true } },
+        -- stylua: ignore
+        keys = {
+            { "<leader>j", mode = { "n", "x", "o" }, function() require("flash").jump() end,       desc = "Flash" },
+            { "<leader>J", mode = { "n", "x", "o" }, function() require("flash").treesitter() end, desc = "Flash Treesitter" },
+            -- { "<leader>r", mode = "o", function() require("flash").remote() end, desc = "Remote Flash" },
+            -- { "<leader>R", mode = { "o", "x" }, function() require("flash").treesitter_search() end, desc = "Treesitter Search" },
+            -- { "<c-s>", mode = { "c" }, function() require("flash").toggle() end, desc = "Toggle Flash Search" },
+        },
+    },
+    {
+        "kylechui/nvim-surround",
+        version = "^3.0.0", -- Use for stability; omit to use `main` branch for the latest features
+        event = "VeryLazy",
+        config = function()
+            require("nvim-surround").setup({
+                -- Configuration here, or leave empty to use defaults
+            })
+        end,
     },
-  },
-  {
-    "kylechui/nvim-surround",
-    version = "^3.0.0", -- Use for stability; omit to use `main` branch for the latest features
-    event = "VeryLazy",
-    config = function()
-      require("nvim-surround").setup({
-        -- Configuration here, or leave empty to use defaults
-      })
-    end,
-  },
 }