diff --git a/vim/vimrc b/vim/vimrc
index 9ea4c5a..4180ae7 100644
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -226,15 +226,24 @@ require 'nvim-treesitter.configs'.setup {
       },
       smart_rename = {
         enable = true,
-        smart_rename = "<Leader>r",              -- mapping to rename reference under cursor
+        keymaps = {
+            smart_rename = "<Leader>r",              -- mapping to rename reference under cursor
+        }
       },
       navigation = {
         enable = true,
-        goto_definition = "<Leader>tg",          -- mapping to go to definition of symbol under cursor
-        list_definitions = "<Leader>ta"          -- mapping to list all definitions in current file
+        keymaps = {
+            goto_definition = "<Leader>tg",          -- mapping to go to definition of symbol under cursor
+            list_definitions = "<Leader>ta"          -- mapping to list all definitions in current file
+        }
       }
     },
-    ensure_installed = {'python'}
+    ensure_installed = {'python', 'yaml', 'rust', 'ocaml'}
 }
 EOF
 endif
+
+set foldmethod=expr
+set foldexpr=nvim_treesitter#foldexpr()
+
+" nnoremap <silent> <leader>tsr :w | e | TSBufEnable('highlight')<CR>