diff --git a/.config/nvim/init.vim b/.config/nvim/init.vim
index f2bd7d5..8b1ff5b 100644
--- a/.config/nvim/init.vim
+++ b/.config/nvim/init.vim
@@ -654,6 +654,9 @@ au BufNewFile,BufRead *.mikrotik setfiletype routeros
 " Ebuild
 au BufNewFile,BufRead,BufWritePre *.ebuild let g:shfmt_extra_args = '-ci -sr -s'
 
+" TOML
+autocmd BufWritePre *.toml silent! undojoin | Neoformat taplo
+
 " Terrafrom
 autocmd BufWritePre *.tf lua vim.lsp.buf.format()
 autocmd BufWritePre *.tfvars lua vim.lsp.buf.format()
diff --git a/.local/bin/Update-pkg b/.local/bin/Update-pkg
index b954533..09e92b7 100755
--- a/.local/bin/Update-pkg
+++ b/.local/bin/Update-pkg
@@ -426,6 +426,11 @@ function install_tss_client() {
 
 }
 
+function install_taplo() {
+    # Install taplo
+    $install taplo
+}
+
 function main() {
     command_start update_pip
     command_start install_neovim_module_for_python
@@ -459,6 +464,7 @@ function main() {
     command_start install_kubernetes
     command_start install_rust
     command_start install_tss_client
+    command_start install_taplo
     command_start update
 }