diff --git a/.config/nvim/lua/keymap.lua b/.config/nvim/lua/keymap.lua
index e7e4b12..908d4b1 100644
--- a/.config/nvim/lua/keymap.lua
+++ b/.config/nvim/lua/keymap.lua
@@ -7,8 +7,8 @@ vim.keymap.set('i', '<F2>', '<NOP>', { noremap = true })
 vim.keymap.set('i', '<F3>', '<NOP>', { noremap = true })
 vim.keymap.set('i', '<F4>', '<NOP>', { noremap = true })
 vim.keymap.set('i', '<F5>', '<NOP>', { noremap = true })
-vim.keymap.set('i', '<F6>', '<NOP>', { noremap = true })
-vim.keymap.set('i', '<F7>', '<NOP>', { noremap = true })
+vim.keymap.set({ 'n', 'i' }, '<F6>', '<NOP>', { noremap = true })
+vim.keymap.set({ 'n', 'i' }, '<F7>', '<NOP>', { noremap = true })
 vim.keymap.set('i', '<F8>', '<NOP>', { noremap = true })
 vim.keymap.set({ 'n', 'i' }, '<F9>', '<NOP>', { noremap = true })
 vim.keymap.set({ 'n', 'i' }, '<F10>', '<NOP>', { noremap = true })
@@ -21,10 +21,6 @@ vim.keymap.set('n', '<C-j>', '<C-w>j', { noremap = true })
 vim.keymap.set('n', '<C-k>', '<C-w>k', { noremap = true })
 vim.keymap.set('n', '<C-l>', '<C-w>l', { noremap = true })
 
--- mapping Dictionaries
-vim.keymap.set('n', '<F6>', ':setlocal spell! spelllang=de_de<CR>', { noremap = true })
-vim.keymap.set('n', '<F7>', ':setlocal spell! spelllang=en_us<CR>', { noremap = true })
-
 -- compiler for languages
 vim.keymap.set('n', '<leader>c', ':w! | !compiler <c-r>%<CR>', { noremap = true })
 
diff --git a/.config/nvim/lua/loadplugins.lua b/.config/nvim/lua/loadplugins.lua
index 934f547..ef32937 100644
--- a/.config/nvim/lua/loadplugins.lua
+++ b/.config/nvim/lua/loadplugins.lua
@@ -553,6 +553,15 @@ return require("lazy").setup({
       'stevearc/oil.nvim',
       dependencies = { "nvim-tree/nvim-web-devicons" },
       opts = {},
+    },
+
+    -- improve spelling check for coding to feature camelcase, etc
+    {
+      'kamykn/spelunker.vim',
+      dependencies = { 'kamykn/popup-menu.nvim' },
+      config = function ()
+        vim.o.nospell = true
+      end
     }
 
   },