diff --git a/.gitignore b/.gitignore
index 6f2da367..90e96f12 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,6 +5,7 @@ node_modules/
 
 # Visual Studio & Visual Studio Code
 .vs*/
+.idea/
 
 # Clangd C++ index files
 .cache/
diff --git a/packages/arch/PKGBUILD b/packages/arch/PKGBUILD
index 91ac82a7..b89954e9 100644
--- a/packages/arch/PKGBUILD
+++ b/packages/arch/PKGBUILD
@@ -1,6 +1,9 @@
-pkgver=2.29.1
+# Maintainers: SteamClientHomebrew <https://github.com/SteamClientHomebrew>
+
+pkgver=2.31.0
 pkgname="millennium"
-pkgrel=2
+_pkgdir="Millennium"
+pkgrel=1
 pkgdesc="Millennium is an open-source low-code modding framework to create, manage and use themes/plugins for the desktop Steam Client without any low-level internal interaction or overhead."
 arch=('x86_64')
 url="https://github.com/SteamClientHomebrew/Millennium"
@@ -9,28 +12,30 @@ depends=('git' 'steam')
 makedepends=('npm' 'curl' 'zip' 'unzip' 'tar' 'cmake' 'ninja' 'lib32-gcc-libs' 'pnpm')
 depends_x86_64=('lib32-python311-bin')
 conflicts=('python-i686-bin')
-source=("git+$url.git#commit=8b8b66ced4e9b4dbb302aa192a6fd97d9bf8baf2")
+source=("git+$url.git#branch=next") # TODO: update to commit on main branch when we merge.
 sha256sums=('SKIP')
 options=(!debug)
 install=millennium.install
 
 prepare() {
-    cd "Millennium"
+    cd "$srcdir/$_pkgdir" || exit
     echo -e "\e[1m\e[92m==>\e[0m \e[1mCloning submodules...\e[0m"
     git submodule update --init --recursive
 }
 
 build() {
     export NODE_NO_WARNINGS=1
-    cd "$srcdir/Millennium"
+    cd "$srcdir/$_pkgdir" || exit
 
     echo -e "\e[1m\e[92m==>\e[0m \e[1mBuilding Millennium assets...\e[0m"
 
-    cd sdk && pnpm install && pnpm run build && cd ..
-    cd src/frontend && pnpm install && npm run build && cd ..
+    pnpm --dir src/frontend install
+    pnpm --dir src/frontend run build
+    pnpm --dir sdk          install
+    pnpm --dir sdk          run build
 
-    mkdir -p ./shims/build/
-    cp -r ./sdk/typescript-packages/loader/build/* ./shims/build/
+    mkdir -p    "./shims/build/"
+    cp -r       "./sdk/typescript-packages/loader/build/*" "./shims/build/"
 
     echo -e "\e[1m\e[92m==>\e[0m \e[1mBuilding Millennium...\e[0m"
 
@@ -38,19 +43,18 @@ build() {
     cmake --build build --config Release
 }
 
-# TODO: FIX PKG_BUILD
-
 package() {
-    cd "$srcdir/Millennium"
+    cd "$srcdir/$_pkgdir" || exit
 
-    bash ./scripts/ci/posix/mk-assets.sh "$pkgdir/usr/share/millennium/assets"
+    # Create final directory structure
     mkdir -p "$pkgdir/usr/lib/millennium"
-
-    install -Dm755 build/libmillennium_x86.so "$pkgdir/usr/lib/millennium/libmillennium_x86.so"
-    install -Dm755 build/unix-hooks/libmillennium_bootstrap_86x.so "$pkgdir/usr/lib/millennium/libmillennium_bootstrap_86x.so"
-
     mkdir -p "$pkgdir/usr/share/millennium/shims"
-
-    cp -r ./shims/build/* "$pkgdir/usr/share/millennium/shims/"
-    install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+    mkdir -p "$pkgdir/usr/share/millennium/assets"
+
+    install -Dm755  "build/libmillennium_x86.so"                        "$pkgdir/usr/lib/millennium/libmillennium_x86.so"
+    install -Dm755  "build/unix-hooks/libmillennium_bootstrap_86x.so"   "$pkgdir/usr/lib/millennium/libmillennium_bootstrap_86x.so"
+    install -Dm755  "build/src/hhx64-build/libmillennium_hhx64.so"      "$pkgdir/usr/lib/millennium/libmillennium_hhx64.so"
+    mv              "src/pipx"                                          "$pkgdir/usr/share/millennium/assets/"
+    cp -r           "./shims/build/*"                                   "$pkgdir/usr/share/millennium/shims/"
+    install -Dm644  "LICENSE"                                           "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
 }