diff --git a/.config/nvim/.gitignore b/.config/nvim/.gitignore
new file mode 100644
index 0000000..ed0e3f9
--- /dev/null
+++ b/.config/nvim/.gitignore
@@ -0,0 +1 @@
+plugged
diff --git a/.config/nvim/init.lua b/.config/nvim/init.lua
index 72ce0e8..2bb5827 100644
--- a/.config/nvim/init.lua
+++ b/.config/nvim/init.lua
@@ -15,7 +15,6 @@ vim.o.showmatch = true           -- highlight matching parentheses / brackets [{
 vim.o.laststatus = 2             -- always show statusline (even with only single window)
 vim.o.ruler = true               -- show line and column number of the cursor on right side of statusline
 vim.o.visualbell = true          -- blink cursor on error, instead of beeping
-vim.o.invlist = true             -- show tabs
 
 
 vim.api.nvim_set_keymap("n", "<leader>", "<Plug>(easymotion-bd-jk)", { noremap = true })
@@ -24,17 +23,19 @@ vim.api.nvim_set_var("toggle_syntax_state", true)
 
 -- Plugins
 local Plug = vim.fn['plug#']
-
 vim.call('plug#begin', '~/.config/nvim/plugged')
-	Plug 'tpope/vim-sensible'
-	Plug 'tpope/vim-surround'
-	Plug('scrooloose/nerdtree', {on = {'NERDTreeToggle', 'NERDTree'}})
-	Plug 'junegunn/goyo.vim'
+	-- Editor basics and navigation
+	Plug 'tpope/vim-sensible' -- some good default configs, we love tpope :)
+	Plug 'tpope/vim-surround' -- add surround motion (s), example: to change the surrounding double quotes to single quotes type: cs"' 
+	Plug('scrooloose/nerdtree', {on = {'NERDTreeToggle', 'NERDTree'}}) -- file browser
+	Plug 'junegunn/goyo.vim' -- zen mode
 	Plug('junegunn/fzf', {['do'] = vim.fn['fzf#install']})
-	Plug('nvim-treesitter/nvim-treesitter', {['do'] = vim.fn['TSUpdate']})
-	Plug 'ctrlpvim/ctrlp.vim'
+	Plug('nvim-treesitter/nvim-treesitter', {['do'] = vim.fn['TSUpdate']}) -- add support for text objects
+	-- Plug 'ctrlpvim/ctrlp.vim' -- minimal fuzzyfinder
 	Plug 'wadackel/vim-dogrun' -- colorscheme
-	Plug 'tribela/vim-transparent'
+	Plug 'tribela/vim-transparent' -- clear background
+	Plug 'nvim-lua/plenary.nvim' -- testing framework, required for telescope
+	Plug 'nvim-telescope/telescope.nvim' -- fancy fuzzyfinder
 
 	-- LSP
 	Plug 'neovim/nvim-lspconfig'
@@ -49,6 +50,7 @@ vim.call('plug#begin', '~/.config/nvim/plugged')
 	-- Airline
 	Plug 'vim-airline/vim-airline'
 	Plug 'vim-airline/vim-airline-themes'
+
     -- Lang Support
 	Plug 'sheerun/vim-polyglot'
 	Plug 'evanleck/vim-svelte'
@@ -56,6 +58,7 @@ vim.call('plug#begin', '~/.config/nvim/plugged')
 	Plug 'pangloss/vim-javascript'
 vim.call('plug#end')
 
+-- set colorscheme
 vim.cmd(':colorscheme dogrun')
 
 -- setup Airline
@@ -155,13 +158,45 @@ require('lspconfig')['svelte'].setup{
 	flags = lsp_flags
 }
 
-vim.cmd("let g:ctrlp_custom_ignore = 'node_modules\\|DS_Store\\|git\\|build\\|dist\\|target'")
+
+
+-- fuzzy finder config
+local telescope = require("telescope")
+local actions = require("telescope.actions")
+
+telescope.setup({
+	defaults = {
+		mappings = {
+			i = {
+				["<C-k>"] = actions.move_selection_previous,
+				["<C-j>"] = actions.move_selection_next,
+				["<C-u>"] = false,
+				["<C-p>"] = false,
+				["<esc>"] = actions.close,
+			},
+		},
+	},
+	pickers = {},
+	extensions = {},
+})
 
 -- keymaps
-vim.keymap.set("n", "<c-s>", ":wa<cr>")
-vim.keymap.set("n", "<c-t>", ":NERDTreeToggle<cr>")
-vim.keymap.set("n", "<leader>tt", ":TransparentToggle<cr>")
-vim.keymap.set("n", "gt", ":bn<cr>")
-vim.keymap.set("n", "gT", ":bp<cr>")
-vim.keymap.set("n", "<cr>", ":nohlsearch<cr><cr>")
+local opts = { noremap=true, silent=true }
+vim.keymap.set("n", "<c-s>", ":wa<cr>:echo 'File saved.'<cr>")
+vim.keymap.set("n", "<c-t>", ":NERDTreeToggle<cr>", opts)
+vim.keymap.set("n", "<leader>tt", ":TransparentToggle<cr>", opts)
+vim.keymap.set("n", "gt", ":bn<cr>", opts)
+vim.keymap.set("n", "gT", ":bp<cr>", opts)
+vim.keymap.set("n", "<cr>", ":nohlsearch<cr><cr>", opts)
+vim.keymap.set("n", "<leader>ff", ":Telescope find_files<cr>", opts)
+vim.keymap.set("n", "<c-p>", ":Telescope find_files<cr>", opts)
+vim.keymap.set("n", "<leader>fg", ":Telescope live_grep<cr>", opts)
+vim.keymap.set("n", "<leader>fb", ":Telescope buffers<cr>", opts)
+vim.keymap.set("n", "<leader>fh", ":Telescope help_tags<cr>", opts)
+vim.keymap.set("n", "<f1>", "", opts)
+vim.keymap.set("i", "<f1>", "", opts)
+vim.keymap.set('n', '<space>e', vim.diagnostic.open_float, opts)
+vim.keymap.set('n', '[d', vim.diagnostic.goto_prev, opts)
+vim.keymap.set('n', ']d', vim.diagnostic.goto_next, opts)
+vim.keymap.set('n', '<space>q', vim.diagnostic.setloclist, opts)
 
diff --git a/.config/nvim/plugged/LuaSnip b/.config/nvim/plugged/LuaSnip
deleted file mode 160000
index 7d78278..0000000
--- a/.config/nvim/plugged/LuaSnip
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 7d78278c2a935b8cd1b6b43065223e14490f3133
diff --git a/.config/nvim/plugged/cmp-buffer b/.config/nvim/plugged/cmp-buffer
deleted file mode 160000
index 62fc67a..0000000
--- a/.config/nvim/plugged/cmp-buffer
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 62fc67a2b0205136bc3e312664624ba2ab4a9323
diff --git a/.config/nvim/plugged/cmp-cmdline b/.config/nvim/plugged/cmp-cmdline
deleted file mode 160000
index c36ca4b..0000000
--- a/.config/nvim/plugged/cmp-cmdline
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit c36ca4bc1dedb12b4ba6546b96c43896fd6e7252
diff --git a/.config/nvim/plugged/cmp-nvim-lsp b/.config/nvim/plugged/cmp-nvim-lsp
deleted file mode 160000
index affe808..0000000
--- a/.config/nvim/plugged/cmp-nvim-lsp
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit affe808a5c56b71630f17aa7c38e15c59fd648a8
diff --git a/.config/nvim/plugged/cmp-path b/.config/nvim/plugged/cmp-path
deleted file mode 160000
index 981baf9..0000000
--- a/.config/nvim/plugged/cmp-path
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 981baf9525257ac3269e1b6701e376d6fbff6921
diff --git a/.config/nvim/plugged/cmp_luasnip b/.config/nvim/plugged/cmp_luasnip
deleted file mode 160000
index a9de941..0000000
--- a/.config/nvim/plugged/cmp_luasnip
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit a9de941bcbda508d0a45d28ae366bb3f08db2e36
diff --git a/.config/nvim/plugged/ctrlp.vim b/.config/nvim/plugged/ctrlp.vim
deleted file mode 160000
index 3ce448c..0000000
--- a/.config/nvim/plugged/ctrlp.vim
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 3ce448c9687ae96dea0caf4da388ecd8d9072f72
diff --git a/.config/nvim/plugged/fzf b/.config/nvim/plugged/fzf
deleted file mode 160000
index 51fdaad..0000000
--- a/.config/nvim/plugged/fzf
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 51fdaad002a5ad827bd5ebfac43386592005d02c
diff --git a/.config/nvim/plugged/goyo.vim b/.config/nvim/plugged/goyo.vim
deleted file mode 160000
index a9c7283..0000000
--- a/.config/nvim/plugged/goyo.vim
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit a9c7283dce60ffcdec952384f6451ff42f8914f2
diff --git a/.config/nvim/plugged/nerdtree b/.config/nvim/plugged/nerdtree
deleted file mode 160000
index fc85a6f..0000000
--- a/.config/nvim/plugged/nerdtree
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit fc85a6f07c2cd694be93496ffad75be126240068
diff --git a/.config/nvim/plugged/nvim-cmp b/.config/nvim/plugged/nvim-cmp
deleted file mode 160000
index 9897465..0000000
--- a/.config/nvim/plugged/nvim-cmp
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 9897465a7663997b7b42372164ffc3635321a2fe
diff --git a/.config/nvim/plugged/nvim-lspconfig b/.config/nvim/plugged/nvim-lspconfig
deleted file mode 160000
index 06161ec..0000000
--- a/.config/nvim/plugged/nvim-lspconfig
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 06161eca0aaaafbede0234216aefaed2e5eb46d8
diff --git a/.config/nvim/plugged/nvim-treesitter b/.config/nvim/plugged/nvim-treesitter
deleted file mode 160000
index 0fc45ea..0000000
--- a/.config/nvim/plugged/nvim-treesitter
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 0fc45ea650df87c47ab4fcfe903693ce170c71c3
diff --git a/.config/nvim/plugged/vim b/.config/nvim/plugged/vim
deleted file mode 160000
index d7723a8..0000000
--- a/.config/nvim/plugged/vim
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit d7723a842a6cfa2f62cf85530ab66eb418521dc2
diff --git a/.config/nvim/plugged/vim-airline b/.config/nvim/plugged/vim-airline
deleted file mode 160000
index 91b67e3..0000000
--- a/.config/nvim/plugged/vim-airline
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 91b67e3ca2d7bc66544724f9c702265c564a1f2e
diff --git a/.config/nvim/plugged/vim-airline-themes b/.config/nvim/plugged/vim-airline-themes
deleted file mode 160000
index 97cf3e6..0000000
--- a/.config/nvim/plugged/vim-airline-themes
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 97cf3e6e638f936187d5f6e9b5eb1bdf0a4df256
diff --git a/.config/nvim/plugged/vim-dogrun b/.config/nvim/plugged/vim-dogrun
deleted file mode 160000
index f1a6ec6..0000000
--- a/.config/nvim/plugged/vim-dogrun
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit f1a6ec680da5f2da7d8629dfa55fe222ae878c2d
diff --git a/.config/nvim/plugged/vim-javascript b/.config/nvim/plugged/vim-javascript
deleted file mode 160000
index d6e1375..0000000
--- a/.config/nvim/plugged/vim-javascript
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit d6e137563c47fb59f26ed25d044c0c7532304f18
diff --git a/.config/nvim/plugged/vim-polyglot b/.config/nvim/plugged/vim-polyglot
deleted file mode 160000
index 38282d5..0000000
--- a/.config/nvim/plugged/vim-polyglot
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 38282d58387cff48ac203f6912c05e4c8686141b
diff --git a/.config/nvim/plugged/vim-prisma b/.config/nvim/plugged/vim-prisma
deleted file mode 160000
index e91ac50..0000000
--- a/.config/nvim/plugged/vim-prisma
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit e91ac5011232e1bd8ea53204db8d01203d5d0f3c
diff --git a/.config/nvim/plugged/vim-sensible b/.config/nvim/plugged/vim-sensible
deleted file mode 160000
index 226203b..0000000
--- a/.config/nvim/plugged/vim-sensible
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 226203be173bf0b95ee2a5cb6575ae604b3f9f7a
diff --git a/.config/nvim/plugged/vim-surround b/.config/nvim/plugged/vim-surround
deleted file mode 160000
index bf3480d..0000000
--- a/.config/nvim/plugged/vim-surround
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit bf3480dc9ae7bea34c78fbba4c65b4548b5b1fea
diff --git a/.config/nvim/plugged/vim-svelte b/.config/nvim/plugged/vim-svelte
deleted file mode 160000
index 1080030..0000000
--- a/.config/nvim/plugged/vim-svelte
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 1080030d6a1bc6582389c133a07552ba0a442410
diff --git a/.config/nvim/plugged/vim-transparent b/.config/nvim/plugged/vim-transparent
deleted file mode 160000
index e2f16c1..0000000
--- a/.config/nvim/plugged/vim-transparent
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit e2f16c1e3341773518b68799264c6cfd7ac8bd7a
diff --git a/.config/nvim/plugged/yats.vim b/.config/nvim/plugged/yats.vim
deleted file mode 160000
index 68cd1da..0000000
--- a/.config/nvim/plugged/yats.vim
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 68cd1da2bcea5fb3fbe6b6266958ae7c72e814da
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..4b691ca
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,2 @@
+.cfg
+*/plugged/