diff --git a/packages/nerd-fonts-cascadia-code/nerd-fonts-cascadia-code.pacscript b/packages/nerd-fonts-cascadia-code/nerd-fonts-cascadia-code.pacscript
index d1793219ad..d680f64b29 100644
--- a/packages/nerd-fonts-cascadia-code/nerd-fonts-cascadia-code.pacscript
+++ b/packages/nerd-fonts-cascadia-code/nerd-fonts-cascadia-code.pacscript
@@ -1,20 +1,13 @@
 name="nerd-fonts-cascadia-code"
-pkgname="nerd-fonts-cascadia-code"
-pkgver="3.0.2"
-gives="${pkgname}"
-breaks=("${pkgname}")
+pkgver="3.1.1"
 repology=("project: fonts:nerd-fonts")
-replace=("${gives}")
-url="https://github.com/ryanoasis/nerd-fonts/releases/download/v${pkgver}/CascadiaCode.zip"
+replace=("${name}")
+url="https://github.com/ryanoasis/nerd-fonts/releases/download/v${pkgver}/CascadiaCode.tar.xz"
 pkgdesc="Patched font Cascadia Code from Nerd Fonts library"
-hash="e68cf12cc3c14a18b9ddce0e77f66a78e3ebec4a5224423674fdd9303c5c9272"
-license="OFL-1.1"
+hash="6f5f72a9df47c4d96cc427c89a12c0c538b5873aa46c9e2d3df3306b7429bef4"
 maintainer="heyzsh <haidarzsh@gmail.com>"
 
 package() {
-  sudo install -d "${pkgdir}"/usr/share/fonts/OTF
-  sudo install -Dm644 "${SRCDIR}/"*.otf "${pkgdir}"/usr/share/fonts/OTF
-  sudo install -Dm644 "${SRCDIR}"/LICENSE "${pkgdir}"/usr/share/licenses/"${pkgname}"/LICENSE
-  ## Won't be necessary and might change in the future ##
-  # sudo install -Dm644 "${SRCDIR}"/readme.md "${pkgdir}"/usr/share/doc/"${pkgname}"/readme.md
+  sudo install -Dm644 ./*.otf -t "${pkgdir}/usr/share/fonts/OTF"
+  sudo install -Dm644 "LICENSE" -t "${pkgdir}/usr/share/licenses/${name}"
 }
diff --git a/packages/nerd-fonts-hack/nerd-fonts-hack.pacscript b/packages/nerd-fonts-hack/nerd-fonts-hack.pacscript
index 90de7e8ae0..0e08f2e623 100644
--- a/packages/nerd-fonts-hack/nerd-fonts-hack.pacscript
+++ b/packages/nerd-fonts-hack/nerd-fonts-hack.pacscript
@@ -1,17 +1,13 @@
 name="nerd-fonts-hack"
-pkgname="nerd-fonts-hack"
-breaks=("${pkgname}")
-gives="${pkgname}"
-#repology=("project: fonts:nerd-fonts")
-pkgver="2.2.2"
-pkgrel="2"
-url="https://github.com/ryanoasis/nerd-fonts/releases/download/v${pkgver}/Hack.zip"
-pkgdesc="Patched font Hack from nerd-fonts library"
-hash="1f031b6d08d51f4830eacd00853dddc7fbd4ae0a05e169f2c13f3037dd3359b3"
+replace=("${name}")
+repology=("project: fonts:nerd-fonts")
+pkgver="3.1.1"
+url="https://github.com/ryanoasis/nerd-fonts/releases/download/v${pkgver}/Hack.tar.xz"
+pkgdesc="Patched font Hack from Nerd Fonts library"
+hash="0d820cb2fedb86a15ca1354e03f26443face8b6aa190610263fad1125a409a16"
 maintainer="Elsie19 <elsie19@pm.me>"
 
 package() {
-  sudo install -d "${pkgdir}"/usr/share/fonts/TTF
-  sudo rm ./*"Windows Compatible.ttf"
-  sudo install -Dm644 ./*.ttf "${pkgdir}"/usr/share/fonts/TTF
+  sudo install -Dm644 ./*.ttf -t "${pkgdir}/usr/share/fonts/TTF"
+  sudo install -Dm644 "LICENSE.md" -t "${pkgdir}/usr/share/licenses/${name}"
 }
diff --git a/packages/nerd-fonts-jetbrains-mono/nerd-fonts-jetbrains-mono.pacscript b/packages/nerd-fonts-jetbrains-mono/nerd-fonts-jetbrains-mono.pacscript
index 455e93e422..5ee5b2c2ef 100644
--- a/packages/nerd-fonts-jetbrains-mono/nerd-fonts-jetbrains-mono.pacscript
+++ b/packages/nerd-fonts-jetbrains-mono/nerd-fonts-jetbrains-mono.pacscript
@@ -1,16 +1,13 @@
 name="nerd-fonts-jetbrains-mono"
-pkgname="nerd-fonts-jetbrains-mono"
-breaks=("${pkgname}")
-gives="${pkgname}"
-#repology=("project: fonts:nerd-fonts")
-pkgver="2.2.2"
-url="https://github.com/ryanoasis/nerd-fonts/releases/download/v${pkgver}/JetBrainsMono.zip"
-pkgdesc="Patched font JetBrains Mono fron nerd-fonts library"
-hash="8b9b6c58081d179ecd50839a6b211dbd24b61e66d87715860129b6138982ee7b"
+replace=("${name}")
+repology=("project: fonts:nerd-fonts")
+pkgver="3.1.1"
+url="https://github.com/ryanoasis/nerd-fonts/releases/download/v${pkgver}/JetBrainsMono.tar.xz"
+pkgdesc="Patched font JetBrains Mono from Nerd Fonts library"
+hash="92225abcacf2fe500c59c5f16962528909a0c5caec8e2aa14a6546ff268a1db9"
 maintainer="Damian Bednarczyk <dbednar230@gmail.com>"
 
 package() {
-  sudo install -d "${pkgdir}"/usr/share/fonts/TTF
-  sudo rm "${SRCDIR:?}/"*"Windows Compatible.ttf"
-  sudo install -Dm644 "${SRCDIR}/"*.ttf "${pkgdir}"/usr/share/fonts/TTF
+  sudo install -Dm644 ./*.ttf -t "${pkgdir}/usr/share/fonts/TTF"
+  sudo install -Dm644 "OFL.txt" -t "${pkgdir}/usr/share/licenses/${name}"
 }