diff --git a/lua/mzpx/core/keymaps.lua b/lua/mzpx/core/keymaps.lua
index 317972e..7fdd8b7 100755
--- a/lua/mzpx/core/keymaps.lua
+++ b/lua/mzpx/core/keymaps.lua
@@ -1,6 +1,8 @@
 vim.g.mapleader = " "
 
 local keymap = vim.keymap
+local base_comment = ""
+
 
 -- Modes
 -- 
@@ -12,30 +14,45 @@ local keymap = vim.keymap
 --   "c" = command mode
 --
 
--- ----------------------------------------------------------------------------
--- Normal
--- ----------------------------------------------------------------------------
+
+-- ************************************************************************************************
+-- 
+-- NORMAL MODE
+--
+-- ************************************************************************************************
+
+-- ------------------------------------------------------------------------------------------------
 -- Window splitting
-keymap.set( "n", "<leader>sv",  "<C-w>v"                ) -- split widow vertically
-keymap.set( "n", "<leader>sh",  "<C-w>s"                ) -- split widow horizontaly
-keymap.set( "n", "<leader>se",  "<C-w>="                ) -- make split windows equal width
-keymap.set( "n", "<leader>sx",  ":close<CR>"            ) -- close window
+-- ------------------------------------------------------------------------------------------------
+-- keymap.set( "n", "<leader>sv",  "<C-w>v" , {desc = "slit widow vertically"}         ) -- slit widow vertically
+keymap.set( "n", "<leader>sh",  "<C-w>s" , {desc = "split widow horizontaly"}       ) -- split widow horizontaly
+keymap.set( "n", "<leader>se",  "<C-w>=" , {desc = "make split windows equal width"}) -- make split windows equal width
+keymap.set( "n", "<leader>sx",  ":close<CR>" , {desc = "close window"}              ) -- close window
 -- keymap.set( "n", "<leader>sm",  ":MaximizerToggle<CR>"  )
 keymap.set( "n", "<leader>sm", '<cmd>lua require("maximizer").toggle()<CR>', {silent = true, noremap = true})
 -- keymap.set('n', 'mm', '<cmd>lua require("maximizer").maximize()<CR>', {silent = true, noremap = true})
 -- keymap.set('n', 'mr', '<cmd>lua require("maximizer").restore()<CR>', {silent = true, noremap = true})
 --
 
--- Window navigation
+-- ----------------------------------------------------------------------------
+-- Window navigation commans
+-- ----------------------------------------------------------------------------
 keymap.set( "n", "<C-h>",       "<C-w>h")
 keymap.set( "n", "<C-j>",       "<C-w>j")
 keymap.set( "n", "<C-k>",       "<C-w>k")
 keymap.set( "n", "<C-l>",       "<C-w>l")
 
---
--- Insert date 
---
-keymap.set( "n", "<leader><leader>d", ":pu=strftime('%Y-%m-%d')<CR>"    )
+-- ----------------------------------------------------------------------------
+-- Insert spectial info
+-- ----------------------------------------------------------------------------
+keymap.set( "n", "<leader><leader>d", ":pu=strftime('%Y-%m-%d')<CR>" , {desc = "Insert actual date"} )
+keymap.set( "n", "<leader><leader>c", 
+            "i-- ------------------------------------------------------------------------------------------------<CR><CR>" ..
+                "------------------------------------------------------------------------------------------------<CR><esc>", 
+            {desc = "Insert main comment section"} )
+keymap.set( "n", "yc", "yy<cmd>normal gcc<CR>p", { noremap = true, desc = "Duplicate line and comment original" })
+
+
 
 --
 --
@@ -53,7 +70,10 @@ keymap.set( "n", "<leader><leader>d", ":pu=strftime('%Y-%m-%d')<CR>"    )
 keymap.set( "n", "<S-l>",       ":bnext<cr>"        )   -- next buffer
 keymap.set( "n", "<S-h>",       ":bprevious<cr>"    )   -- prev buffer
 keymap.set( "n", "<C-w>",       ":bd<CR>"           )   -- delete buffer
+-- keymap.set( "n", "<C-TAB>",     ":bnext<cr>"        )   -- go to next tab
+-- keymap.set( "n", "<C-S-TAB>",   ":bprevious<CR>"    )   -- go to prev tab
 
+--
 -- TABs
 keymap.set( "n", "<leader>to",  ":tabnew<CR>"       )   -- open new tab
 keymap.set( "n", "<leader>tx",  ":tabclose<CR>"     )   -- close current tab
@@ -67,56 +87,74 @@ keymap.set( "n", "g]", vim.diagnostic.goto_next)
 -- 
 keymap.set( "n", ",",           "*"                 ) -- due to HUN keybard, the * hard to access: 
 
+keymap.set("n", "<leader>nh", ":nohl<CR>")
+keymap.set("n", "x", '"_x"')
 
 
--- ----------------------------------------------------------------------------
+
+
+-- ************************************************************************************************
+--
 -- Insert mode
--- ----------------------------------------------------------------------------
+--
+-- ************************************************************************************************
 keymap.set("i", "jk", "<ESC>")
 
--- ----------------------------------------------------------------------------
+-- ************************************************************************************************
+--
 -- Visual mode
--- ----------------------------------------------------------------------------
+--
+-- ************************************************************************************************
 -- Stay in indent mode
 keymap.set("v", "<", "<gv")
 keymap.set("v", ">", ">gv")
 
+-- ------------------------------------------------------------------------------------------------
 -- Visual Block --
+-- ------------------------------------------------------------------------------------------------
 keymap.set("v", "<A-j>",  ":m .+1<CR>==")
 keymap.set("v", "<A-k>",  ":m .-2<CR>==")
 keymap.set("v", "p", '"_dP')
 
+-- ------------------------------------------------------------------------------------------------
 -- Move text up and down
+-- ------------------------------------------------------------------------------------------------
 keymap.set( "x", "J",       ":move '>+1<CR>gv-gv")
 keymap.set( "x", "K",       ":move '<-2<CR>gv-gv")
 keymap.set( "x", "<A-j>",   ":move '>+1<CR>gv-gv")
 keymap.set( "x", "<A-k>",   ":move '<-2<CR>gv-gv")
 
 
--- Terminal --
+
+-- ************************************************************************************************
+--
+-- Terminal 
+--
+-- ************************************************************************************************
+
+-- ------------------------------------------------------------------------------------------------
 -- Better terminal navigation
+-- ------------------------------------------------------------------------------------------------
 keymap.set( "t", "<C-h>", "<C-\\><C-N><C-w>h")
 keymap.set( "t", "<C-j>", "<C-\\><C-N><C-w>j")
 keymap.set( "t", "<C-k>", "<C-\\><C-N><C-w>k")
 keymap.set( "t", "<C-l>", "<C-\\><C-N><C-w>l")
 
-keymap.set("n", "<leader>nh", ":nohl<CR>")
-keymap.set("n", "x", '"_x"')
 
-keymap.set("n", "<C-TAB>",      ":tabn<CR>")    -- go to next tab
-keymap.set("n", "<C-S-TAB>",    ":tabp<CR>")    -- go to prev tab
+-- ------------------------------------------------------------------------------------------------
 -- plugin keymaps
+-- ------------------------------------------------------------------------------------------------
 
 -- nvim-tree
-keymap.set("n", "<leader>e", ":NvimTreeToggle<CR>")
+keymap.set("n", "<leader>e", ":NvimTreeToggle<CR>", {desc = "File browser"})
 
 -- telescope
 --keymap.set("n", "<leader>ff", ":Telescope find_files<cr>" )
-keymap.set("n", "<leader>ff", ":Files<cr>" )
-keymap.set("n", "<leader>fs", ":Telescope live_grep<cr>"  )
+keymap.set("n", "<leader>ff", ":Files<cr>" , {desc = "File find (internal)"})  
+keymap.set("n", "<leader>fs", ":Telescope live_grep<cr>" , {desc = "File grep (internal)"} )
 keymap.set("n", "<leader>fg", ":Rg<cr>")
-keymap.set("n", "<leader>fb", ":Telescope buffers<cr>"    )
-keymap.set("n", "<leader>fh", ":Telescope help_tags<cr>"  )
+keymap.set("n", "<leader>fb", ":Telescope buffers<cr>" , {desc = "Buffer search"}   )
+keymap.set("n", "<leader>fh", ":Telescope help_tags<cr>" , {desc = "help_tags search"} )
 
 keymap.set("n", "<leader>x", "<cmd>lua require'telescope.builtin'.find_files(require('telescope.themes').get_dropdown({ previewer = false }))<cr>")
 keymap.set("n", "<c-t>", "<cmd>Telescope live_grep<cr>")
diff --git a/lua/mzpx/core/options.lua b/lua/mzpx/core/options.lua
index 3d594bc..cc3819e 100755
--- a/lua/mzpx/core/options.lua
+++ b/lua/mzpx/core/options.lua
@@ -105,17 +105,9 @@ autocmd CursorHold * lua vim.diagnostic.open_float(nil, { focusable = false })
 opt.clipboard:append("unnamedplus")         -- allows neovim to access the system clipboard
 opt.iskeyword:append("-")
 
---vim.g.neovide_cursor_vfx_mode = ""
---vim.g.neovide_cursor_animation_length = 0
---vim.g.neovide_transparency = 1.0
---vim.g.neovide_remember_window_size = true
----- vim.g.neovide_profiler =false 
---vim.g.neovide_scroll_animation_length = 0.0
-
-
---
+-- ----------------------------------------------------------------------------
 -- which.key options - 2026-05-28
---
+-- ----------------------------------------------------------------------------
 vim.o.timeout = true
 vim.o.timeoutlen = 300
 vim.o.mouse = ''
diff --git a/lua/mzpx/core/plugins.lua b/lua/mzpx/core/plugins.lua
index a5249f9..13b9062 100755
--- a/lua/mzpx/core/plugins.lua
+++ b/lua/mzpx/core/plugins.lua
@@ -56,6 +56,8 @@ packer.init {
 -- ----------------------------------------------------------------------------
 return packer.startup(function(use)
 
+    vim.tbl_islist = vim.islist
+
     -- ------------------------------------------------------
     -- Have packer manage itself
     -- ------------------------------------------------------
@@ -143,6 +145,7 @@ return packer.startup(function(use)
     use {
         "L3MON4D3/LuaSnip",             -- Required
         "rafamadriz/friendly-snippets", -- Optional
+        run = "make install_jsregexp" 
     }
 
     -- --------------------------------------------------------------
@@ -173,26 +176,26 @@ return packer.startup(function(use)
     -- --------------------------------------------------------------
     -- nvim-treesitter - mz
     -- --------------------------------------------------------------
-    use {
-            'nvim-treesitter/nvim-treesitter',
-            branch = "master",
-            run = ':TSUpdate',   -- This automatically updates parsers on install/update
-        }
+    -- use {
+    --         'nvim-treesitter/nvim-treesitter',
+    --         branch = "master",
+    --         run = ':TSUpdate',   -- This automatically updates parsers on install/update
+    --     }
 
     -- --------------------------------------------------------------
     -- render-markdown - mz
     -- --------------------------------------------------------------
-    use {
-          "MeanderingProgrammer/render-markdown.nvim",
-          after = { 'nvim-treesitter' },
-          -- requires = { 'nvim-mini/mini.nvim', opt = true },         -- if you use the mini.nvim suite
-          requires = { 'nvim-mini/mini.icons', opt = true },           -- if you use standalone mini plugins
-          -- requires = { 'nvim-tree/nvim-web-devicons', opt = true }, -- if you prefer nvim-web-devicons
-          config = function()
-            require('render-markdown').setup({})
-          end
-        }
-
+    -- use {
+    --       "MeanderingProgrammer/render-markdown.nvim",
+    --       after = { 'nvim-treesitter' },
+    --       -- requires = { 'nvim-mini/mini.nvim', opt = true },         -- if you use the mini.nvim suite
+    --       requires = { 'nvim-mini/mini.icons', opt = true },           -- if you use standalone mini plugins
+    --       -- requires = { 'nvim-tree/nvim-web-devicons', opt = true }, -- if you prefer nvim-web-devicons
+    --       config = function()
+    --         require('render-markdown').setup({})
+    --       end
+    --     }
+    --
     -- -------------------------------------------------------------
     -- which-key
     -- -------------------------------------------------------------