diff --git a/init.vim b/init.vim
index 62510b3..d1d3f49 100644
--- a/init.vim
+++ b/init.vim
@@ -107,13 +107,13 @@ let g:use_livedown = 0
 let g:use_nerdcommenter = 1
 let g:use_nerdtree = 1
 let g:use_pandoc = 0
-let g:use_polyglot = 1
+let g:use_polyglot = 0
 let g:use_python = 1
 let g:use_sound = 0
 let g:use_sxhkd = 1
 let g:use_templator = 0
 let g:use_utf8 = 1
-let g:use_vimtex = 0
+let g:use_vimtex = 1
 let g:ycm_clang = ''
 let g:ycm_confirm_extra_conf = 0
 let g:ycm_filetype_whitelist = {'cpp': 1}
@@ -418,7 +418,6 @@ let $NVIM_TUI_ENABLE_TRUE_COLOR=1
 " Disable polyglot for latex files
 " ===
 if g:use_polyglot == 1
-    let g:polyglot_disabled = ['latex']
     let g:vim_markdown_conceal = 0
 endif
 " ===
@@ -427,24 +426,22 @@ endif
 " Setup vimtex
 " ===
 if g:use_vimtex == 1
-    let g:vimtex_compiler_latexmk = {
-                \ 'backend' : 'nvim',
-                \ 'background' : 1,
-                \ 'build_dir' : '',
-                \ 'callback' : 1,
-                \ 'continuous' : 0,
-                \ 'executable' : 'latexmk',
-                \ 'options' : [
-                \   '-verbose',
-                \   '-file-line-error',
-                \   '-synctex=1',
-                \   '-interaction=nonstopmode',
-                \   '-shell-escape',
-                \ ],
-                \}
+    let g:polyglot_disabled = ['latex', 'tex']
+
+    let g:tex_flavor='latex'
+    let g:vimtex_syntax_autoload_packages = ['hyperref', 'listings', 'luacode', 'minted']
+    let g:vimtex_format_enabled = 1
+    let g:vimtex_indent_enabled = 1
+
+    "let g:vimtex_indent_ignored_envs = ['document']
+    "let g:vimtex_syntax_minted = [{'lang':'text'}, {'lang':'console'}]
+
+    let g:vimtex_compiler_latexmk = {'backend':'nvim', 'background':0, 'build_dir':'', 'callback':1, 'continuous':0, 'executable':'latexmk', 'options':['-verbose', '-file-line-error', '-shell-escape']}
+    "let g:vimtex_compiler_latexmk = {'backend':'nvim', 'background':1, 'build_dir':'', 'callback':1, 'continuous':1, 'executable':'latexmk', 'options':['-verbose', '-file-line-error', '-synctex=1', '-interaction=nonstopmode', '-lualatex', '-shell-escape']}
 
     let g:vimtex_quickfix_mode = 1
     let g:vimtex_quickfix_open_on_warning = 0
+
     if g:platform ==? "windows" || g:platform ==? "windows_portable"
         let g:vimtex_view_enabled = 1
         let g:vimtex_view_general_viewer = 'SumatraPDF'
@@ -458,7 +455,7 @@ if g:use_vimtex == 1
         let g:vimtex_view_general_viewer = ''
     endif
 
-    let g:vimtex_fold_enabled=1
+    "let g:vimtex_fold_enabled=1
 endif
 " ===