diff --git a/.gitmodules b/.gitmodules
index 4e9c0d7..a7248b6 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -85,3 +85,12 @@
 [submodule "pack/general/start/LuaSnip-snippets.nvim"]
 	path = pack/general/start/LuaSnip-snippets.nvim
 	url = https://github.com/molleweide/LuaSnip-snippets.nvim
+[submodule "pack/general/start/telescope-fzy-native.nvim"]
+	path = pack/general/start/telescope-fzy-native.nvim
+	url = https://github.com/nvim-telescope/telescope-fzy-native.nvim
+[submodule "pack/general/start/nvim-web-devicons"]
+	path = pack/general/start/nvim-web-devicons
+	url = https://github.com/nvim-tree/nvim-web-devicons
+[submodule "pack/general/start/telescope-luasnip.nvim"]
+	path = pack/general/start/telescope-luasnip.nvim
+	url = https://github.com/benfowler/telescope-luasnip.nvim
diff --git a/init.lua b/init.lua
index d855b60..1e6d791 100644
--- a/init.lua
+++ b/init.lua
@@ -28,7 +28,9 @@ g.mapleader = ' '
 ---- Terminal ----
 vim.api.nvim_create_autocmd({ "TermOpen" }, {
 	callback = function()
-		vim.l.number = false
+		if vim.l then
+			vim.l.number = false
+		end
 	end,
 })
 
@@ -51,11 +53,6 @@ g['airline#extensions#tabline#left_sep'] = ' '
 g['airline#extensions#tabline#left_alt_sep'] = '|'
 
 ---- Maps ----
-local function map(mode, lhs, rhs, opts)
-	local options = {noremap = true, silent = true}
-	if opts then options = vim.tbl_extend('force', options, opts) end
-	vim.keymap.set(mode, lhs, rhs, options)
-end
 vim.keymap.set('!','<C-BS>','<C-w>')
 vim.keymap.set('v','>','>gv')
 vim.keymap.set('v','<','<gv')
@@ -339,23 +336,32 @@ g.vim_markdown_no_default_key_mappings = 1
 g.vim_markdown_folding_disabled = 1
 g.vim_markdown_toml_frontmatter = 1
 ---- Telescope
-require('telescope').setup{
+local telescope = require 'telescope'
+telescope.setup{
 	defaults = {
-		file_sorter =  require'telescope.sorters'.get_fzy_sorter,
 		file_ignore_patterns = {"%.avif", "%.jpg", "%.pdf", "%.png", "%.webp"},
+	},
+	pickers = {
+		find_files = {
+			hidden = true,
+		}
 	}
 }
-map('n', '<Leader>f', ':Telescope fd<CR>')
-map('n', '<Leader>b', ':Telescope buffers<CR>')
-map('n', '<Leader>/', ':Telescope current_buffer_fuzzy_find<CR>')
---map('n', '<Leader>*', ':Telescope grep_string<CR>')
-map('n', '<Leader>g', ':Telescope live_grep<CR>')
-map('n', '<Leader>cg', ':Telescope grep_string<CR>')
+telescope.load_extension('fzy_native')
+telescope.load_extension('luasnip')
+local builtin = require('telescope.builtin')
+vim.keymap.set('n', '<Leader>f', builtin.fd)
+vim.keymap.set('n', '<Leader>b', builtin.buffers)
+vim.keymap.set('n', '<Leader>/', builtin.current_buffer_fuzzy_find)
+vim.keymap.set('n', '<Leader>g', builtin.live_grep)
+vim.keymap.set('n', '<Leader>cg', builtin.grep_string)
+vim.keymap.set('n', '<Leader>:', builtin.commands)
+vim.keymap.set('n', '<Leader>s', telescope.extensions.luasnip.luasnip)
 ---- nvim-dap
 local dap = require('dap')
 vim.fn.sign_define('DapBreakpoint',{ text ='🟥', texthl ='', linehl ='', numhl =''})
 vim.fn.sign_define('DapStopped',{ text ='▶️', texthl ='', linehl ='', numhl =''})
--- Set keymaps to control the debugger
+-- Set keymaps to control the debugge
 vim.keymap.set('n', '<leader>dc', require 'dap'.continue)
 vim.keymap.set('n', '<leader>do', require 'dap'.step_over)
 vim.keymap.set('n', '<leader>di', require 'dap'.step_into)
@@ -376,3 +382,6 @@ dap.listeners.before.event_exited["dapui_config"]=function()
 end
 -- nvim-dap-go
 require('dap-go').setup()
+
+---- web-devicons
+require('nvim-web-devicons').setup()
diff --git a/pack/general/start/nvim-web-devicons b/pack/general/start/nvim-web-devicons
new file mode 160000
index 0000000..4ec26d6
--- /dev/null
+++ b/pack/general/start/nvim-web-devicons
@@ -0,0 +1 @@
+Subproject commit 4ec26d67d419c12a4abaea02f1b6c57b40c08d7e
diff --git a/pack/general/start/telescope-fzy-native.nvim b/pack/general/start/telescope-fzy-native.nvim
new file mode 160000
index 0000000..282f069
--- /dev/null
+++ b/pack/general/start/telescope-fzy-native.nvim
@@ -0,0 +1 @@
+Subproject commit 282f069504515eec762ab6d6c89903377252bf5b
diff --git a/pack/general/start/telescope-luasnip.nvim b/pack/general/start/telescope-luasnip.nvim
new file mode 160000
index 0000000..849c4ee
--- /dev/null
+++ b/pack/general/start/telescope-luasnip.nvim
@@ -0,0 +1 @@
+Subproject commit 849c4ee1951f34041a26744d2a88284545564ff0