diff --git a/PatchTools/Patcher.bat b/PatchTools/Patcher.bat
index 2001316e..1cbf3596 100644
--- a/PatchTools/Patcher.bat
+++ b/PatchTools/Patcher.bat
@@ -24,7 +24,7 @@ rd /S /Q .\hacpack_backup\
 del .\*.nca
 mkdir .\temp
 mkdir .\temp\pcv_exefs
-hactool -k prod.keys --disablekeywarns -t -nca .\pcv-backup --exefsdir .\temp
+hactoolnet -k prod.keys --disablekeywarns -t -nca .\pcv-backup --exefsdir .\temp
 nx2elf .\temp\main
 bspatch .\temp\main.elf .\temp\main-mod.elf .\pcv-bspatch
 elf2nso .\temp\main-mod.elf .\temp\pcv_exefs\main
diff --git a/PatchTools/hactool.exe b/PatchTools/hactool.exe
deleted file mode 100644
index fa78409b..00000000
Binary files a/PatchTools/hactool.exe and /dev/null differ
diff --git a/PatchTools/hactoolnet.exe b/PatchTools/hactoolnet.exe
new file mode 100644
index 00000000..a21229da
Binary files /dev/null and b/PatchTools/hactoolnet.exe differ
diff --git a/README.md b/README.md
index f20a42de..9c584f0d 100644
--- a/README.md
+++ b/README.md
@@ -87,11 +87,12 @@ Overclocking suite for Switch **(Mariko Only)** running on Atmosphere CFW. Suppo
 
 - Patches for pcv and ptm modules
 - Patch tools for pcv module (only for amd64 Windows, build yourself otherwise):
-  [hactool](https://github.com/SciresM/hactool), [nx2elf](https://github.com/shuffle2/nx2elf), elf2nso from [switch-tools](https://github.com/switchbrew/switch-tools/), [hacPack](https://github.com/The-4n/hacPack), [bsdiff-win](https://github.com/cnSchwarzer/bsdiff-win/) ([bsdiff](http://www.daemonology.net/bsdiff/))
+  [hactoolnet](https://github.com/Thealexbarney/LibHac/), [nx2elf](https://github.com/shuffle2/nx2elf), elf2nso from [switch-tools](https://github.com/switchbrew/switch-tools/), [hacPack](https://github.com/The-4n/hacPack), [bsdiff-win](https://github.com/cnSchwarzer/bsdiff-win/) ([bsdiff](http://www.daemonology.net/bsdiff/))
 - Prebuilt sys-clk-OC and ReverseNX-RT modified for OC
 - `system-settings.ini` with some QoL improvements
 
 **Notice**:
+
 - **Patching SysNAND is NOT recommended**. Since system files are directly altered, you could **NOT** boot to stock(OFW) until you revert the patch.
 - **Restoring pcv backup is required before updating** Horizon OS and booting OFW. Launch the `patcher.te` script to restore your backup.
 - **Do NOT forget to reapply ptm-patch** after changing RAM OC clock.
diff --git a/Source/InfoNX/.gitmodules b/Source/InfoNX/.gitmodules
deleted file mode 100644
index 1afbb8c0..00000000
--- a/Source/InfoNX/.gitmodules
+++ /dev/null
@@ -1,3 +0,0 @@
-[submodule "libs/libtesla"]
-	path = libs/libtesla
-	url = https://github.com/WerWolv/libtesla