diff --git a/lazy-lock.json b/lazy-lock.json
index 2203095..a07331a 100644
--- a/lazy-lock.json
+++ b/lazy-lock.json
@@ -28,6 +28,7 @@
   "nvim-navic": { "branch": "master", "commit": "83dc174da915f9dbc9b51169e9b62a2e0d42b527" },
   "nvim-tree.lua": { "branch": "master", "commit": "bb375fb20327c49920c41d2b51c1ce2f4fe7deb3" },
   "nvim-treesitter": { "branch": "master", "commit": "2ce3c9080cfe4a39c7907e672edafd2a95244a7c" },
+  "nvim-ts-autotag": { "branch": "main", "commit": "6be1192965df35f94b8ea6d323354f7dc7a557e4" },
   "nvim-ts-context-commentstring": { "branch": "main", "commit": "0bf8fbc2ca8f8cdb6efbd0a9e32740d7a991e4c3" },
   "nvim-web-devicons": { "branch": "master", "commit": "986875b7364095d6535e28bd4aac3a9357e91bbe" },
   "onedarker.nvim": { "branch": "freeze", "commit": "b00dd2189f264c5aeb4cf04c59439655ecd573ec" },
diff --git a/lua/maps.lua b/lua/maps.lua
index e0de2ba..8fb23e9 100644
--- a/lua/maps.lua
+++ b/lua/maps.lua
@@ -10,14 +10,22 @@
 lvim.keys.normal_mode["<F2>"] = ":NvimTreeToggle<CR>"
 lvim.keys.normal_mode["q"] = ":bd<CR>"
 lvim.keys.normal_mode["Q"] = ":qa!<CR>"
--- lvim.keys.normal_mode["<<leader>-[>"] = ":BufferLineCyclePrev<CR>"
+
+lvim.keys.normal_mode["\\["] = ":BufferLineCyclePrev<CR>"
+lvim.keys.normal_mode["\\]"] = ":BufferLineCycleNext<CR>"
 
 -- lvim.builtin.which_key.mappings["\["] = ":BufferLineCyclePrev<CR>"
 -- nmap <leader>[ :BufferLineCyclePrev<CR>
 -- nmap <leader>] :BufferLineCycleNext<CR>
-lvim.builtin.which_key.mappings["["] = {
-    "<cmd>BufferLineCycleNext<CR>", "Projects"
+-- lvim.builtin.which_key.mappings["["] = {
+--     "<cmd>BufferLineCyclePrev<CR>", "Prev buffer"
+-- }
+-- lvim.builtin.which_key.mappings["="] = {
+--     "<cmd>BufferLineCycleNext<CR>", "next buffer"
+-- }
+lvim.builtin.which_key.mappings["f"] = {
+    "<cmd>Telescope find_files<cr>", "Find files"
 }
-lvim.builtin.which_key.mappings["]"] = {
-    "<cmd>BufferLineCyclePrev<CR>", "Projects"
+lvim.builtin.which_key.mappings["t"] = {
+    "<cmd>Telescope live_grep<cr>", "Find word"
 }
diff --git a/lua/options.lua b/lua/options.lua
index ccb4e34..adedd08 100644
--- a/lua/options.lua
+++ b/lua/options.lua
@@ -3,10 +3,13 @@ lvim.format_on_save.enabled = true
 
 vim.g.user = "veypi"
 vim.g.email = "i@veypi.com"
+vim.g.templates_directory = '~/.config/lvim/templates'
 
 local options = {
-    fileencoding = "utf-8",                  -- the encoding written to a file
-    wrap = false,                            -- display lines as one long line
+    fileencoding = "utf-8", -- the encoding written to a file
+
+    textwidth = 70,
+    wrap = true,                             -- display lines as one long line
 
     showtabline = 1,                         -- always show tabs
     expandtab = true,                        -- convert tabs to spaces
diff --git a/lua/plugins.lua b/lua/plugins.lua
index fdd4386..23220c5 100644
--- a/lua/plugins.lua
+++ b/lua/plugins.lua
@@ -2,7 +2,12 @@ lvim.plugins = {
     {
         'aperezdc/vim-template',
         config = function()
-            vim.cmd("let g:templates_directory = '~/.config/lvim/templates'")
+        end,
+    },
+    {
+        "windwp/nvim-ts-autotag",
+        config = function()
+            require("nvim-ts-autotag").setup()
         end,
     },
 }