diff --git a/group_vars/all/neovim.yml b/group_vars/all/neovim.yml
index e67edd3..ae2f5d9 100644
--- a/group_vars/all/neovim.yml
+++ b/group_vars/all/neovim.yml
@@ -21,7 +21,6 @@ neovim_plugins:
     name: 'cmp-nvim-lua'
   - url: 'https://github.com/nvim-treesitter/nvim-treesitter'
     name: 'nvim-treesitter'
-    version: master # main seems broken?
   - url: 'https://github.com/nvim-lua/plenary.nvim'
     name: 'plenary.nvim'
   - url: 'https://github.com/nvim-telescope/telescope-fzf-native.nvim'
diff --git a/templates/nvim/lua/colorscheme.lua.j2 b/templates/nvim/lua/colorscheme.lua.j2
index 067d136..4cbea41 100644
--- a/templates/nvim/lua/colorscheme.lua.j2
+++ b/templates/nvim/lua/colorscheme.lua.j2
@@ -29,7 +29,7 @@ Use the `Introspect` option to inspect available options:
 
 dbus-send \
 --session \
---print-reply \
+--print-reply ]
 --reply-timeout=2000 \
 --type=method_call \
 --dest=org.freedesktop.portal.Desktop \
diff --git a/templates/nvim/lua/lsp.lua.j2 b/templates/nvim/lua/lsp.lua.j2
index 1da3fdc..12e6684 100644
--- a/templates/nvim/lua/lsp.lua.j2
+++ b/templates/nvim/lua/lsp.lua.j2
@@ -29,7 +29,7 @@ end
 
 --enable some language servers with the additional completion capabilities
 --offered by nvim-cmp
-local auto_setup_servers = {
+local servers = {
   {% for item in language_servers %}
   {% if item.auto_setup and not loop.last %}
   '{{ item.server_name }}',
@@ -43,8 +43,10 @@ local auto_setup_servers = {
 local capabilities = vim.lsp.protocol.make_client_capabilities()
 capabilities = require('cmp_nvim_lsp').default_capabilities(capabilities)
 
-for _, lsp in ipairs(auto_setup_servers) do
-  vim.lsp.config[lsp] = {
+local nvim_lsp = require('lspconfig')
+
+for _, lsp in ipairs(servers) do
+  nvim_lsp[lsp].setup {
     on_attach = on_attach,
     capabilities = capabilities,
   }
@@ -58,26 +60,26 @@ local python_root_dir = function(fname)
     util.path.dirname(fname)
 end
 
-vim.lsp.config['ruff'] = {
+nvim_lsp.ruff.setup {
   on_attach = on_attach,
   capabilities = capabilities,
   root_dir = python_root_dir
 }
 
 
-vim.lsp.config['pyright'] = {
+nvim_lsp.pyright.setup {
   settings = {
     pyright = {
       -- Using Ruff's import organizer
-        disableOrganizeImports = true,
+      disableOrganizeImports = true,
     },
-  }
+  },
 }
 
 local snippet_capabilities = vim.deepcopy(capabilities);
 snippet_capabilities.textDocument.completion.completionItem.snippetSupport = true
 
-vim.lsp.config['html'] = {
+nvim_lsp.html.setup {
   on_attach = on_attach,
   capabilities = snippet_capabilities,
   filetypes = { 'html', 'htmldjango' },
@@ -90,17 +92,17 @@ vim.lsp.config['html'] = {
   }
 }
 
-vim.lsp.config['cssls'] = {
+nvim_lsp.cssls.setup {
   on_attach = on_attach,
   capabilities = snippet_capabilities,
 }
 
-vim.lsp.config['jsonls'] = {
+nvim_lsp.jsonls.setup {
   on_attach = on_attach,
   capabilities = snippet_capabilities,
 }
 
-vim.lsp.config['lua_ls'] = {
+nvim_lsp.lua_ls.setup {
   on_attach = on_attach,
   capabilities = snippet_capabilities,
   settings = {
@@ -113,24 +115,12 @@ vim.lsp.config['lua_ls'] = {
 }
 
 {% endif %}
-vim.lsp.config['yamlls'] = {
+nvim_lsp.yamlls.setup {
   on_attach = on_attach,
   capabilities = capabilities,
   filetypes = { 'yaml', 'yaml.ansible', 'yaml.docker-compose', 'yaml.gitlab' }
 }
 
-local servers = {
-  {% for item in language_servers %}
-  {% if not loop.last %}
-  '{{ item.server_name }}',
-  {% else %}
-  '{{ item.server_name }}'
-  {% endif %}
-  {% endfor %}
-}
-
-vim.lsp.enable { unpack(servers) }
-
 local cmp = require('cmp')
 local luasnip = require('luasnip')
 
diff --git a/templates/nvim/lua/telescope.lua.j2 b/templates/nvim/lua/telescope.lua.j2
index 38a5adc..d568703 100644
--- a/templates/nvim/lua/telescope.lua.j2
+++ b/templates/nvim/lua/telescope.lua.j2
@@ -23,13 +23,12 @@ vim.keymap.set('n', 'fj', builtin.jumplist, opts)
 vim.keymap.set('n', 'fl', builtin.loclist, opts)
 vim.keymap.set('n', 'fq', builtin.quickfix, opts)
 vim.keymap.set('n', 'fm', builtin.marks, opts)
-vim.keymap.set('n', 'ft', builtin.treesitter, opts)
 
 telescope.setup({
   defaults = {
     layout_strategy = 'vertical',
     layout_config = {
-      prompt_position = 'bottom',
+      prompt_position = 'top',
       vertical = { width = 0.8, height = 0.9 }
     },
   },