diff --git a/.config/nvim/after/available/context.rc.lua b/.config/nvim/after/available/context.rc.lua
index e63bbca..3e9ae96 100644
--- a/.config/nvim/after/available/context.rc.lua
+++ b/.config/nvim/after/available/context.rc.lua
@@ -1,7 +1,7 @@
 -- " Configuration for context.vim
 -- "" Disable context.vim on json files
--- ""let g:context_filetype_blacklist = ["json", "log"]
-require'treesitter-context'.setup{
+vim.g.context_filetype_blacklist = {"json", "log"}
+require('treesitter-context').setup{
     enable = true, -- Enable this plugin (Can be enabled/disabled later via commands)
     throttle = true, -- Throttles plugin updates (may improve performance)
     max_lines = 0, -- How many lines the window should span. Values <= 0 mean no limit.
diff --git a/.config/nvim/after/available/digraphs.rc.vim b/.config/nvim/after/available/digraphs.rc.vim
index a7b7bb6..e69de29 100644
--- a/.config/nvim/after/available/digraphs.rc.vim
+++ b/.config/nvim/after/available/digraphs.rc.vim
@@ -1 +0,0 @@
-inoremap <C-k><C-k> <Cmd>lua require'better-digraphs'.digraphs("i")<CR>
diff --git a/.config/nvim/after/available/fterm.rc.lua b/.config/nvim/after/available/fterm.rc.lua
index ce97b21..908e27b 100644
--- a/.config/nvim/after/available/fterm.rc.lua
+++ b/.config/nvim/after/available/fterm.rc.lua
@@ -39,7 +39,3 @@ require'FTerm'.setup({
     -- See `:h jobstart-options`
     on_stderr = nil,
 })
-
--- Example keybindings
-vim.keymap.set('n', '<leader>i', '<CMD>lua require("FTerm").toggle()<CR>')
-vim.keymap.set('t', '<leader>i', '<CMD>lua require("FTerm").toggle()<CR>')
diff --git a/.config/nvim/after/available/icons.rc.lua b/.config/nvim/after/available/icons.rc.lua
index 002e144..11412cd 100644
--- a/.config/nvim/after/available/icons.rc.lua
+++ b/.config/nvim/after/available/icons.rc.lua
@@ -1,5 +1 @@
-require("icon-picker")
-
-local opts = { noremap = true, silent = true }
-
-vim.keymap.set("n", "<leader>o", "<cmd>PickIcons<cr>", opts)
+require("icon-picker").setup({disable_legacy_commands = true })
diff --git a/.config/nvim/after/available/iswap.rc.lua b/.config/nvim/after/available/iswap.rc.lua
index badcc1c..deaca66 100644
--- a/.config/nvim/after/available/iswap.rc.lua
+++ b/.config/nvim/after/available/iswap.rc.lua
@@ -1,5 +1 @@
-require('iswap').setup{}
-
-local opts = { noremap=true, silent=true }
-vim.api.nvim_set_keymap('n', 'ta', '<cmd>ISwapWith<cr>', opts)
-vim.api.nvim_set_keymap('n', 'tn', '<cmd>ISwap<cr>', opts)
+require('iswap').setup({ autoswap = true })
diff --git a/.config/nvim/after/available/minimap.rc.lua b/.config/nvim/after/available/minimap.rc.lua
index 3da1516..01d9e47 100644
--- a/.config/nvim/after/available/minimap.rc.lua
+++ b/.config/nvim/after/available/minimap.rc.lua
@@ -1,4 +1 @@
-local codewindow = require('codewindow')
-
-codewindow.setup()
-codewindow.apply_default_keybinds()
+require('codewindow').setup()
diff --git a/.config/nvim/after/available/nvim-tree.rc.lua b/.config/nvim/after/available/nvim-tree.rc.lua
index 18a7de8..17f1545 100644
--- a/.config/nvim/after/available/nvim-tree.rc.lua
+++ b/.config/nvim/after/available/nvim-tree.rc.lua
@@ -1,8 +1,3 @@
-local opts = { noremap = true, silent = true }
-
-vim.keymap.set("n", "<leader>tt", "<cmd>NvimTreeToggle<cr>", opts)
-vim.keymap.set("n", "<leader>tf", "<cmd>NvimTreeFindFile<cr>", opts)
-
 vim.g.nvim_tree_refresh_wait = 1000
 
 -- following options are the default
diff --git a/.config/nvim/after/available/other.rc.lua b/.config/nvim/after/available/other.rc.lua
index 8f1bac9..3d4d5be 100644
--- a/.config/nvim/after/available/other.rc.lua
+++ b/.config/nvim/after/available/other.rc.lua
@@ -1,5 +1,4 @@
 -- Plug 'rgroli/other.nvim'
-
 require("other-nvim").setup({
     mappings = {
         -- custom mapping
@@ -56,12 +55,3 @@ require("other-nvim").setup({
 	minHeight = 2
     },
 })
-
-vim.api.nvim_set_keymap("n", "<leader>ll", "<cmd>:Other<CR>", { noremap = true, silent = true })
-vim.api.nvim_set_keymap("n", "<leader>lp", "<cmd>:OtherSplit<CR>", { noremap = true, silent = true })
-vim.api.nvim_set_keymap("n", "<leader>lv", "<cmd>:OtherVSplit<CR>", { noremap = true, silent = true })
-vim.api.nvim_set_keymap("n", "<leader>lc", "<cmd>:OtherClear<CR>", { noremap = true, silent = true })
-
--- Context specific bindings
-vim.api.nvim_set_keymap("n", "<leader>lt", "<cmd>:Other test<CR>", { noremap = true, silent = true })
-vim.api.nvim_set_keymap("n", "<leader>ls", "<cmd>:Other scss<CR>", { noremap = true, silent = true })
diff --git a/.config/nvim/after/available/peek.rc.lua b/.config/nvim/after/available/peek.rc.lua
index f2ea07e..214ebf8 100644
--- a/.config/nvim/after/available/peek.rc.lua
+++ b/.config/nvim/after/available/peek.rc.lua
@@ -21,7 +21,7 @@ local peek = require('peek')
 
 vim.api.nvim_create_user_command('PeekOpen', function()
   if not peek.is_open() and vim.bo[vim.api.nvim_get_current_buf()].filetype == 'markdown' then
-    vim.fn.system('i3-msg split horizontal')
+    --vim.fn.system('i3-msg split horizontal')
     peek.open()
   end
 end, {})
@@ -29,6 +29,6 @@ end, {})
 vim.api.nvim_create_user_command('PeekClose', function()
   if peek.is_open() then
     peek.close()
-    vim.fn.system('i3-msg move left')
+    --vim.fn.system('i3-msg move left')
   end
 end, {})
diff --git a/.config/nvim/after/available/telescope.rc.vim b/.config/nvim/after/available/telescope.rc.vim
deleted file mode 100644
index d69ff66..0000000
--- a/.config/nvim/after/available/telescope.rc.vim
+++ /dev/null
@@ -1,30 +0,0 @@
-lua << EOF
-
--- require('telescope').load_extension('ultisnips')
-require('telescope').load_extension('undo')
-
-EOF
-
-" Using Lua functions
-nnoremap <leader>f <cmd>lua require('telescope.builtin').find_files()<cr>
-nnoremap <leader>a <cmd>lua require('telescope.builtin').grep_string()<cr>
-nnoremap <leader>A <cmd>lua require('telescope.builtin').live_grep()<cr>
-nnoremap <leader>b <cmd>lua require('telescope.builtin').buffers()<cr>
-nnoremap <leader>r <cmd>lua require('telescope.builtin').resume()<cr>
-"nnoremap <leader>fh <cmd>lua require('telescope.builtin').help_tags()<cr>
-nnoremap <leader>tc <cmd>lua require('telescope.builtin').commands()<cr>
-nnoremap <leader>t: <cmd>lua require('telescope.builtin').command_history()<cr>
-nnoremap <leader>t/ <cmd>lua require('telescope.builtin').search_history()<cr>
-nnoremap <leader>tr <cmd>lua require('telescope.builtin').registers()<cr>
-
-" Neovim lsp pickers
-nnoremap <leader>tr <cmd>lua require('telescope.builtin').lsp_references()<cr>
-nnoremap <leader>td <cmd>lua require('telescope.builtin').lsp_definitions()<cr>
-
-" git pickers
-nnoremap <leader>gc <cmd>lua require('telescope.builtin').git_commits()<cr>
-nnoremap <leader>gC <cmd>lua require('telescope.builtin').git_bcommits()<cr>
-nnoremap <leader>gb <cmd>lua require('telescope.builtin').git_branches()<cr>
-
-" nnoremap <leader>s <cmd>lua require('telescope').extensions.ultisnips.ultisnips()<cr>
-nnoremap <leader>u <cmd>lua require('telescope').extensions.undo.undo()<cr>
diff --git a/.config/nvim/after/available/toggler.rc.lua b/.config/nvim/after/available/toggler.rc.lua
index e6eac25..d2d8393 100644
--- a/.config/nvim/after/available/toggler.rc.lua
+++ b/.config/nvim/after/available/toggler.rc.lua
@@ -5,5 +5,3 @@ require('nvim-toggler').setup({
   -- removes the default <leader>i keymap
   remove_default_keybinds = true,
 })
-
-vim.keymap.set({'n', 'v'}, 'gt', require('nvim-toggler').toggle)
diff --git a/.config/nvim/after/available/vim-cmake.rc.vim b/.config/nvim/after/available/vim-cmake.rc.vim
deleted file mode 100644
index 386e35f..0000000
--- a/.config/nvim/after/available/vim-cmake.rc.vim
+++ /dev/null
@@ -1,30 +0,0 @@
-"let g:cmake_build_options = [ "-j10" ]
-"
-"let g:cmake_root_markers = ['.svn']
-"
-"
-"let g:cmake_jump_on_error = 0 " We do not want to focus the console
-"augroup vim-cmake-group
-"autocmd User CMakeBuildFailed :cfirst
-"augroup END
-"
-"augroup vim-cmake-group
-"autocmd! User CMakeBuildSucceeded CMakeClose
-"augroup END
-
-lua << EOF
-require("cmake-tools").setup {
-  cmake_command = "cmake",
-  cmake_build_directory = "build",
-  cmake_generate_options = { "-D", "CMAKE_EXPORT_COMPILE_COMMANDS=1" },
-  cmake_build_options = {},
-  cmake_console_size = 10, -- cmake output window height
-  cmake_show_console = "always", -- "always", "only_on_error"
-  cmake_dap_configuration = { name = "cpp", type = "codelldb", request = "launch" }, -- dap configuration, optional
-  --cmake_dap_open_command = require("dap").repl.open, -- optional
-  cmake_variants_message = {
-    short = { show = true },
-    long = { show = true, max_length = 40 }
-  }
-}
-EOF
diff --git a/.config/nvim/after/available/windows.rc.lua b/.config/nvim/after/available/windows.rc.lua
index a9b0fd4..743898e 100644
--- a/.config/nvim/after/available/windows.rc.lua
+++ b/.config/nvim/after/available/windows.rc.lua
@@ -1,8 +1,3 @@
 vim.o.winwidth = 10
 vim.o.winminwidth = 10
 require("windows").setup()
-
-vim.keymap.set('n', '<C-w>z', "<cmd> WindowsMaximize<cr>")
-vim.keymap.set('n', '<C-w>_', "<cmd> WindowsMaximizeVertically<cr>")
-vim.keymap.set('n', '<C-w>|', "<cmd> WindowsMaximizeHorizontally<cr>")
-vim.keymap.set('n', '<C-w>=', "<cmd WindowsEqualize<cr>")
diff --git a/.config/nvim/after/plugin/md-preview.rc.vim b/.config/nvim/after/plugin/md-preview.rc.vim
deleted file mode 120000
index 3a11464..0000000
--- a/.config/nvim/after/plugin/md-preview.rc.vim
+++ /dev/null
@@ -1 +0,0 @@
-../available/md-preview.rc.vim
\ No newline at end of file
diff --git a/.config/nvim/after/plugin/neorg.rc.lua b/.config/nvim/after/plugin/neorg.rc.lua
deleted file mode 120000
index fe9e272..0000000
--- a/.config/nvim/after/plugin/neorg.rc.lua
+++ /dev/null
@@ -1 +0,0 @@
-../available/neorg.rc.lua
\ No newline at end of file
diff --git a/.config/nvim/after/plugin/telescope.rc.vim b/.config/nvim/after/plugin/telescope.rc.vim
deleted file mode 120000
index 8b964fb..0000000
--- a/.config/nvim/after/plugin/telescope.rc.vim
+++ /dev/null
@@ -1 +0,0 @@
-../available/telescope.rc.vim
\ No newline at end of file
diff --git a/.config/nvim/after/plugin/vim-cmake.rc.vim b/.config/nvim/after/plugin/vim-cmake.rc.vim
deleted file mode 120000
index 3709325..0000000
--- a/.config/nvim/after/plugin/vim-cmake.rc.vim
+++ /dev/null
@@ -1 +0,0 @@
-../available/vim-cmake.rc.vim
\ No newline at end of file
diff --git a/.config/nvim/init.vim b/.config/nvim/init.vim
index 704cb02..31c6b01 100644
--- a/.config/nvim/init.vim
+++ b/.config/nvim/init.vim
@@ -1,23 +1,12 @@
 lua << EOF
-require('core.plugins')
 require('core.config')
-require('core.mappings')
+require('core.plugins')
 EOF
 
 
 "let mapleader = "\\"
 nmap <space> <leader>
 
-"let autoload_plug_path = stdpath('config') . '/autoload/plug.vim'
-"
-"if !filereadable(autoload_plug_path)
-"    silent exe '!curl -fL --create-dirs -o ' . autoload_plug_path .
-"     \ ' https://raw.github.com/junegunn/vim-plug/master/plug.vim'
-"    execute 'source ' . fnameescape(autoload_plug_path)
-"    let plug_install = 1
-"endif
-"unlet autoload_plug_path
-
 "colorscheme enfocado
 "lua require('lualine').setup { options = { theme = 'enfocado' } }
 
@@ -43,5 +32,6 @@ set undodir=~/.cache/nvim/undo/
 set undofile
 
 lua << EOF
+require('core.mappings')
 require('core.temp')
 EOF
diff --git a/.config/nvim/lua/core/mappings.lua b/.config/nvim/lua/core/mappings.lua
index f8f9b22..8085528 100644
--- a/.config/nvim/lua/core/mappings.lua
+++ b/.config/nvim/lua/core/mappings.lua
@@ -1,6 +1,6 @@
 local map = vim.keymap.set
-local default_options = { silent = true }
-local expr_options = { expr = true, silent = true }
+local default_options = { noremap = true, silent = true }
+local expr_options = { noremap = true, expr = true, silent = true }
 
 -- space one line, home,end globally increase/decrease
 map('n', '<Home>', 'zc', default_options)
@@ -20,11 +20,82 @@ map('v', '<c-x>', '<c-x>gv', default_options)
 map('n', '<leader>y', '"_y', default_options)
 map('n', '<leader>d', '"_d', default_options)
 map('v', '<leader>p', '"_p', default_options)
-map("v", "p", '"_dp', default_options)
-map("v", "P", '"_dP', default_options)
+map('v', 'p', '"_dp', default_options)
+map('v', 'P', '"_dP', default_options)
 
-map('n', '<leader>2', '<esc>:set tabstop=2 softtabstop=2 shiftwidth=2<cr>', default_options)
-map('n', '<leader>4', '<esc>:set tabstop=4 softtabstop=4 shiftwidth=4<cr>', default_options)
-map('n', '<leader>8', '<esc>:set tabstop=8 softtabstop=8 shiftwidth=8<cr>', default_options)
+map('n', '<leader>2', '<cmd>set tabstop=2 softtabstop=2 shiftwidth=2<cr>', default_options)
+map('n', '<leader>4', '<cmd>set tabstop=4 softtabstop=4 shiftwidth=4<cr>', default_options)
+map('n', '<leader>8', '<cmd>set tabstop=8 softtabstop=8 shiftwidth=8<cr>', default_options)
 
 map('n', '<leader><space>', '<cmd>nohlsearch<cr>', default_options)
+
+-- digraphs
+map('i', '<C-k>d', '<cmd>lua require("better-digraphs").digraphs("i")<cr>', expr_options)
+
+-- femaco
+--map('n', '<leader>fe'. '<cmd>FeMaCo<cr>', expr_options)
+
+-- fterm
+map('n', '<leader>i', '<CMD>lua require("FTerm").toggle()<CR>', expr_options)
+map('t', '<leader>i', '<CMD>lua require("FTerm").toggle()<CR>', expr_options)
+
+-- icon picker
+map('n', '<C-k>i', '<cmd>IconPickerNormal<cr>', expr_options)
+map('n', '<C-k>y', '<cmd>IconPickerYank<cr>', expr_options)
+map('i', '<C-k>i', '<cmd>IconPickerInsert<cr>', expr_options)
+
+-- iswap
+map('n', '<leader>sw', '<cmd>ISwapWith<cr>', expr_options)
+map('n', '<leader>ss', '<cmd>ISwap<cr>', expr_options)
+
+-- code window
+require('codewindow').apply_default_keybinds()
+
+-- nvim tree
+map('n', '<leader>tt', '<cmd>NvimTreeToggle<cr>', default_options)
+map('n', '<leader>tf', '<cmd>NvimTreeFindFile<cr>', default_options)
+
+-- other
+map('n', '<leader>oo', '<cmd>Other<cr>', default_options)
+map('n', '<leader>os', '<cmd>OtherSplit<cr>', default_options)
+map('n', '<leader>ov', '<cmd>OtherVSplit<cr>', default_options)
+map('n', '<leader>oc', '<cmd>OtherClear<cr>', default_options)
+-- Context specific bindings
+map('n', '<leader>ot', '<cmd>Other test<cr>', default_options)
+map('n', '<leader>os', '<cmd>Other scss<cr>', default_options)
+
+-- quicknote
+map('n', '<leader>qn', '<cmd>lua require("quicknote").NewNoteAtCurrentLine()<cr>', default_options)
+map('n', '<leader>qs', '<cmd>lua require("quicknote").ShowNoteSigns()<cr>', default_options)
+map('n', '<leader>qe', '<cmd>lua require("quicknote").OpenNoteAtCurrentLine()<cr>', default_options)
+map('n', '<leader>qd', '<cmd>lua require("quicknote").DeleteNoteAtCurrentLine()<cr>', default_options)
+
+-- telescope
+map('n', '<leader>f', '<cmd>lua require("telescope.builtin").find_files()<cr>', default_options)
+map('n', '<leader>a', '<cmd>lua require("telescope.builtin").grep_string()<cr>', default_options)
+map('n', '<leader>A', '<cmd>lua require("telescope.builtin").live_grep()<cr>', default_options)
+map('n', '<leader>b', '<cmd>lua require("telescope.builtin").buffers()<cr>', default_options)
+map('n', '<leader>r', '<cmd>lua require("telescope.builtin").resume()<cr>', default_options)
+-- map('n', '<leader>fh', '<cmd>lua require('telescope.builtin').help_tags()<cr>, default_options)
+map('n', '<leader>tc', '<cmd>lua require("telescope.builtin").commands()<cr>', default_options)
+map('n', '<leader>t:', '<cmd>lua require("telescope.builtin").command_history()<cr>', default_options)
+map('n', '<leader>t/', '<cmd>lua require("telescope.builtin").search_history()<cr>', default_options)
+map('n', '<leader>tr', '<cmd>lua require("telescope.builtin").registers()<cr>', default_options)
+-- Neovim lsp pickers
+map('n', '<leader>tr', '<cmd>lua require("telescope.builtin").lsp_references()<cr>', default_options)
+map('n', '<leader>td', '<cmd>lua require("telescope.builtin").lsp_definitions()<cr>', default_options)
+-- git pickers
+map('n', '<leader>gc', '<cmd>lua require("telescope.builtin").git_commits()<cr>', default_options)
+map('n', '<leader>gC', '<cmd>lua require("telescope.builtin").git_bcommits()<cr>', default_options)
+map('n', '<leader>gb', '<cmd>lua require("telescope.builtin").git_branches()<cr>', default_options)
+-- map('n', '<leader>s', '<cmd>lua require('telescope').extensions.ultisnips.ultisnips()<cr>, default_options)
+map('n', '<leader>u', '<cmd>lua require("telescope").extensions.undo.undo()<cr>', default_options)
+
+-- togger not active
+--vim.keymap.set({'n', 'v'}, 'gt', require('nvim-toggler').toggle)
+
+-- windows
+map('n', '<C-w>z', "<cmd> WindowsMaximize<cr>")
+map('n', '<C-w>_', "<cmd> WindowsMaximizeVertically<cr>")
+map('n', '<C-w>|', "<cmd> WindowsMaximizeHorizontally<cr>")
+map('n', '<C-w>=', "<cmd WindowsEqualize<cr>")