diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000..9fbad7e
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,9 @@
+[submodule "packaging/aur/neophyte"]
+	path = packaging/aur/neophyte
+	url = ssh://aur@aur.archlinux.org/neophyte.git
+[submodule "packaging/aur/neophyte-git"]
+	path = packaging/aur/neophyte-git
+	url = ssh://aur@aur.archlinux.org/neophyte-git.git
+[submodule "packaging/aur/neophyte-bin"]
+	path = packaging/aur/neophyte-bin
+	url = ssh://aur@aur.archlinux.org/neophyte-bin.git
diff --git a/packaging/aur/neophyte b/packaging/aur/neophyte
new file mode 160000
index 0000000..1f0487f
--- /dev/null
+++ b/packaging/aur/neophyte
@@ -0,0 +1 @@
+Subproject commit 1f0487f764506b6afadb49654e2199721e593ba8
diff --git a/packaging/aur/neophyte-bin b/packaging/aur/neophyte-bin
new file mode 160000
index 0000000..1f2619f
--- /dev/null
+++ b/packaging/aur/neophyte-bin
@@ -0,0 +1 @@
+Subproject commit 1f2619fd6108a6891fe0f95f0f1e2b0e633283ae
diff --git a/packaging/aur/neophyte-git b/packaging/aur/neophyte-git
new file mode 160000
index 0000000..0736e03
--- /dev/null
+++ b/packaging/aur/neophyte-git
@@ -0,0 +1 @@
+Subproject commit 0736e03efa056dc12d724d222855300e2b667379
diff --git a/packaging/temp/neophyte-bin/.gitignore b/packaging/temp/neophyte-bin/.gitignore
deleted file mode 100644
index 06499d8..0000000
--- a/packaging/temp/neophyte-bin/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-*
-!PKGBUILD
-!.gitignore
diff --git a/packaging/temp/neophyte-bin/PKGBUILD b/packaging/temp/neophyte-bin/PKGBUILD
deleted file mode 100644
index b35c311..0000000
--- a/packaging/temp/neophyte-bin/PKGBUILD
+++ /dev/null
@@ -1,23 +0,0 @@
-# Maintainer: Tim Harding <tim@timharding.co>
-
-pkgname='neophyte-bin'
-pkgver='0.2.4'
-pkgrel=1
-pkgdesc="A WebGPU-rendered Neovim GUI"
-arch=('x86_64')
-url="https://github.com/tim-harding/neophyte"
-license=('MIT')
-provides=("neophyte=$pkgver")
-conflicts=('neophyte' 'neophyte-git')
-source=(
-    "neophyte::$url/releases/download/$pkgver/$pkgname-linux"
-    "README.md::$url"
-)
-sha256sums=('SKIP') # TODO: Add checksums
-
-package() {
-    cd "$pkgname-$pkgver"
-    make DESTDIR="$pkgdir/" install
-}
-
-# vim: ts=4 sts=4 sw=4 et
diff --git a/packaging/temp/neophyte-git/.gitignore b/packaging/temp/neophyte-git/.gitignore
deleted file mode 100644
index 06499d8..0000000
--- a/packaging/temp/neophyte-git/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-*
-!PKGBUILD
-!.gitignore
diff --git a/packaging/temp/neophyte-git/PKGBUILD b/packaging/temp/neophyte-git/PKGBUILD
deleted file mode 100644
index c4e0f42..0000000
--- a/packaging/temp/neophyte-git/PKGBUILD
+++ /dev/null
@@ -1,67 +0,0 @@
-# Maintainer: Tim Harding <tim@timharding.co>
-
-pkgname='neophyte-git'
-pkgver=0.2.4.r0.gc62a622
-pkgrel=1
-pkgdesc='A WebGPU-rendered Neovim GUI'
-arch=('x86_64' 'i686' 'aarch64')
-url="https://github.com/tim-harding/neophyte"
-license=('MIT')
-depends=('fontconfig' 'freetype2' 'gcc-libs' 'glibc')
-makedepends=('git' 'cargo')
-provides=("neophyte=$pkgver")
-conflicts=('neophyte-bin' 'neophyte')
-source=("neophyte::git+$url.git")
-sha256sums=('SKIP')
-
-# From https://wiki.archlinux.org/title/VCS_package_guidelines#Package_naming
-pkgver() {
-  cd "neophyte"
-  git describe --long --abbrev=7 | sed 's/-/.r/;s/-/./'
-}
-
-prepare() {
-    cd "neophyte"
-    git fetch --tags
-    latest_tag=$(git describe --tags "$(git rev-list --tags --max-count=1)")
-    git checkout "$latest_tag"
-    export RUSTUP_TOOLCHAIN=stable
-    target_platform="$(rustc -vV | sed -n 's/host: //p')"
-    cargo fetch \
-        --locked \
-        --target $target_platform
-}
-
-build() {
-    cd "neophyte"
-    export RUSTUP_TOOLCHAIN=stable
-    export CARGO_TARGET_DIR=target
-    export RUSTFLAGS="-C target-cpu=native"
-    cargo build --release --frozen
-}
-
-package() {
-    cd "neophyte"
-
-    install \
-        --mode=0755 \
-        -D --target-directory="$pkgdir/usr/bin/" \
-        target/release/neophyte
-
-    install \
-        --mode=0644 \
-        -D --target-directory="$pkgdir/usr/share/applications/" \
-        assets/neophyte.desktop
-
-    install \
-        --mode=0644 \
-        -D --target-directory="$pkgdir/usr/share/licenses/neophyte/" \
-        LICENSE
-
-    install \
-        --mode=0644 \
-        -D --target-directory="$pkgdir/usr/share/doc/neophyte/" \
-        README.md
-}
-
-# vim: ts=4 sts=4 sw=4 et
diff --git a/packaging/temp/neophyte/.gitignore b/packaging/temp/neophyte/.gitignore
deleted file mode 100644
index 06499d8..0000000
--- a/packaging/temp/neophyte/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-*
-!PKGBUILD
-!.gitignore
diff --git a/packaging/temp/neophyte/PKGBUILD b/packaging/temp/neophyte/PKGBUILD
deleted file mode 100644
index 0e7d656..0000000
--- a/packaging/temp/neophyte/PKGBUILD
+++ /dev/null
@@ -1,64 +0,0 @@
-# Maintainer: Tim Harding <tim@timharding.co>
-
-pkgname='neophyte'
-pkgver='0.2.5'
-pkgrel=1
-pkgdesc='A WebGPU-rendered Neovim GUI'
-arch=('x86_64' 'i686' 'aarch64')
-url="https://github.com/tim-harding/$pkgname"
-license=('MIT')
-depends=('fontconfig' 'freetype2' 'gcc-libs' 'glibc')
-makedepends=('cargo')
-provides=("$pkgname=$pkgver")
-conflicts=("$pkgname-bin" "$pkgname-git")
-source=("$pkgname-$pkgver.tar.gz::https://static.crates.io/crates/$pkgname/$pkgname-$pkgver.crate")
-sha256sums=('SKIP')
-
-# See for best practices:
-# https://wiki.archlinux.org/title/Rust_package_guidelines
-#
-# Test in a clean chroot with `extra-x86_64-build`:
-# https://wiki.archlinux.org/title/DeveloperWiki:Building_in_a_clean_chroot
-
-prepare() {
-    cd "$pkgname-$pkgver"
-    export RUSTUP_TOOLCHAIN=stable
-    target_platform="$(rustc -vV | sed -n 's/host: //p')"
-    cargo fetch \
-        --locked \
-        --target $target_platform
-}
-
-build() {
-    cd "$pkgname-$pkgver"
-    export RUSTUP_TOOLCHAIN=stable
-    export CARGO_TARGET_DIR=target
-    export RUSTFLAGS="-C target-cpu=native"
-    cargo build --release --frozen
-}
-
-package() {
-    cd "$pkgname-$pkgver"
-
-    install \
-        --mode=0755 \
-        -D --target-directory="$pkgdir/usr/bin/" \
-        target/release/$pkgname
-
-    install \
-        --mode=0644 \
-        -D --target-directory="$pkgdir/usr/share/applications/" \
-        assets/neophyte.desktop
-
-    install \
-        --mode=0644 \
-        -D --target-directory="$pkgdir/usr/share/licenses/$pkgname/" \
-        LICENSE
-
-    install \
-        --mode=0644 \
-        -D --target-directory="$pkgdir/usr/share/doc/$pkgname/" \
-        README.md
-}
-
-# vim: ts=4 sts=4 sw=4 et