diff --git a/.config/vim/vimrc b/.config/vim/vimrc
index 51649cc..6f986ef 100644
--- a/.config/vim/vimrc
+++ b/.config/vim/vimrc
@@ -20,16 +20,16 @@ nmap <leader>f :Files<CR>
 " Theme
 packadd! onedark.vim
 " LaTeX
-packadd! vimtex
-source $XDG_CONFIG_HOME/vim/vimtex.vim
+autocmd BufNewFile,BufRead *.tex packadd! vimtex
+	\ | source $XDG_CONFIG_HOME/vim/vimtex.vim
 " Git information
 packadd! vim-gitgutter
 " Surround text with parentheses, brackets, quotes, tags, etc.
 let g:surround_no_mappings = 1
 packadd! vim-surround
 source $XDG_CONFIG_HOME/vim/vim-surround.vim
-
-packadd! arm-syntax-vim
+" ARM assembly syntax highlighting
+autocmd BufNewFile,BufRead *.s,*.S packadd! arm-syntax-vim | set filetype=arm
 
 " Settings #####################################################################
 " hybrid linenumbers
@@ -276,8 +276,5 @@ else
 	endif
 endif
 
-" ARM assembly syntax highlighting
-autocmd BufNewFile,BufRead *.s,*.S set filetype=arm
-
 " Load filetype plugins
 filetype plugin indent on