diff --git a/arch-setup/packages/audiopkgs.txt b/arch-setup/packages/audiopkgs.txt
index 129e14ae..4501d010 100644
--- a/arch-setup/packages/audiopkgs.txt
+++ b/arch-setup/packages/audiopkgs.txt
@@ -4,5 +4,5 @@ pavucontrol
 pipewire
 pipewire-alsa
 pipewire-jack
-wireplumber
 pipewire-pulse
+wireplumber
diff --git a/arch-setup/packages/aurpkgs.txt b/arch-setup/packages/aurpkgs.txt
index 85d59f50..14f7d4f5 100644
--- a/arch-setup/packages/aurpkgs.txt
+++ b/arch-setup/packages/aurpkgs.txt
@@ -4,7 +4,6 @@ btrfsmaintenance
 davfs2
 downgrade
 ffmpeg-normalize
-font-manager-git
 jellyamp
 jellyfin-media-player
 libreoffice-extension-languagetool
@@ -12,7 +11,7 @@ lightdm-settings
 lightdm-slick-greeter
 mpv-mpris
 nemo-audio-tab
-nohang-git
+nohang
 pdfsam
 polybar
 protonmail-bridge-bin
diff --git a/arch-setup/packages/officialpkgs.txt b/arch-setup/packages/officialpkgs.txt
index 55f25f5a..c512041d 100644
--- a/arch-setup/packages/officialpkgs.txt
+++ b/arch-setup/packages/officialpkgs.txt
@@ -23,6 +23,7 @@ firewalld
 fish
 flameshot
 foliate
+font-manager
 freetype2
 fwupd
 fwupd-efi