diff --git a/PKGBUILD b/PKGBUILD
index e306d36..6af26cf 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,47 +1,75 @@
 # Maintainer: Rudra Saraswat <rs2009@ubuntu.com>
 
-pkgbase=blend
-pkgname=(blend blend-settings)
-pkgver=2.0.0
+pkgbase=blend-git
+pkgname=('blend-git' 'blend-settings-git')
+pkgver=r27.0024d66
 pkgrel=1
-pkgdesc='A package manager for blendOS'
-url='https://github.com/blend-os/blend'
-source=("git+https://github.com/blend-os/blend.git"
-        "blend-settings.desktop"
-        "blend-settings")
+_electronversion=22
+pkgdesc="A package manager for blendOS"
+arch=('x86_64' 'i686')
+url="https://github.com/blend-os/blend"
+license=('GPL3')
+makedepends=("electron${_electronversion}" 'git' 'npm')
+source=('git+https://github.com/blend-os/blend.git'
+        'blend-settings.desktop'
+        'blend-settings')
 sha256sums=('SKIP'
             'a605d24d2fa7384b45a94105143db216db1ffc0bdfc7f6eec758ef2026e61e54'
             '73cb7c39190d36f233b8dfbc3e3e6737d56e61e90881ad95f09e5ae1f9b405a8')
-arch=('x86_64')
-makedepends=(electron)
-license=('GPL-3.0-or-later')
+
+pkgver() {
+    cd "${srcdir}/${pkgbase%-git}"
+    printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
+}
+
+prepare() {
+    cd "${srcdir}/${pkgbase%-git}/${pkgbase%-git}-settings"
+    npm config set cache "${srcdir}/npm-cache"
+    npm install
+}
 
 build() {
-    cd "${srcdir}"/blend/blend-settings
-    npm install
+    cd "${srcdir}/${pkgbase%-git}/${pkgbase%-git}-settings"
+    npm config set cache "${srcdir}/npm-cache"
     export NODE_ENV=production
+    electronDist="/usr/lib/electron${_electronversion}"
+    electronVer="$(sed s/^v// /usr/lib/electron${_electronversion}/version)"
     npm run icons
-    npm run pack -- -c.electronDist=/usr/lib/electron -c.electronVersion=22 --publish never
+    npm run pack -- -c.electronDist=${electronDist} \
+        -c.electronVersion=${electronVer} --publish never
 }
 
-package_blend() {
-    depends=('python3' 'podman' 'python-pexpect' 'blend-settings' 'bash')
-    cd "${srcdir}"/blend
-    mkdir -p "${pkgdir}"/usr/bin "${pkgdir}"/usr/lib/systemd/system "${pkgdir}"/usr/lib/systemd/user "${pkgdir}"/usr/lib/initcpio/install "${pkgdir}"/usr/lib/initcpio/hooks
-    cp blend init-blend host-blend blend-system blend-files "${pkgdir}"/usr/bin
-    cp blend-system.service "${pkgdir}"/usr/lib/systemd/system
-    cp blend-files.service "${pkgdir}"/usr/lib/systemd/user
-    cp blend.hook "${pkgdir}"/usr/lib/initcpio/hooks/blend
-    cp blend.install "${pkgdir}"/usr/lib/initcpio/install/blend
+package_blend-git() {
+    depends=('bash' 'blend-settings' 'podman' 'python' 'python-pexpect')
+    provides=("${pkgname%-git}")
+    conflicts=("${pkgname%-git}")
+
+    cd "${srcdir}/${pkgbase%-git}"
+    install -Dm755 \
+        "${pkgname%-git}" \
+        "init-${pkgname%-git}" \
+        "host-${pkgname%-git}" \
+        "${pkgname%-git}-system" \
+        "${pkgname%-git}-files" \
+        -t "${pkgdir}"/usr/bin/
+    install -Dm644 "${pkgname%-git}-system.service" -t \
+        "${pkgdir}"/usr/lib/systemd/system/
+    install -Dm644 "${pkgname%-git}-files.service" -t \
+        "${pkgdir}"/usr/lib/systemd/user/
+    install -Dm644 "${pkgname%-git}.hook" \
+        "${pkgdir}/usr/lib/initcpio/hooks/${pkgname%-git}"
+    install -Dm644 "${pkgname%-git}.install" \
+        "${pkgdir}/usr/lib/initcpio/install/${pkgname%-git}"
 }
 
-package_blend-settings() {
-    # https://aur.archlinux.org/cgit/aur.git/tree/PKGBUILD?h=kuro was really helpful
+package_blend-settings-git() {
+    pkgdesc="blendOS Settings"
+    depends=("electron${_electronversion}")
+
+    cd "${srcdir}/${pkgbase%-git}/${pkgbase%-git}-settings"
 
-    depends=('electron')
-    cd "${srcdir}"/blend/blend-settings
     local _arch
-    case $CARCH in
+    case ${CARCH} in
     i686)
         _arch=linux-ia32-unpacked
         ;;
@@ -49,16 +77,19 @@ package_blend-settings() {
         _arch=linux-unpacked
         ;;
     *)
-        _arch=linux-$CARCH-unpacked
+        _arch=linux-${CARCH}-unpacked
         ;;
     esac
-    install -Dm644 "dist/${_arch}/resources/app.asar" "$pkgdir/usr/lib/blend-settings/blend-settings.asar"
+
+    install -Dm644 "dist/${_arch}/resources/app.asar" \
+        "$pkgdir/usr/lib/${pkgname%-git}/${pkgname%-git}.asar"
+
     for icon_size in 16 24 32 48 64 128 256 512; do
-        install -Dm644 \
-            "build/icons/png/${icon_size}x${icon_size}.png" \
-            "${pkgdir}/usr/share/icons/hicolor/${icon_size}x${icon_size}/apps/blend-settings.png"
+        install -Dm644 "build/icons/png/${icon_size}x${icon_size}.png" \
+            "${pkgdir}/usr/share/icons/hicolor/${icon_size}x${icon_size}/apps/${pkgname%-git}.png"
     done
-    install -Dm644 -t "${pkgdir}/usr/share/applications" "../../blend-settings.desktop"
-    install -Dm755 -t "${pkgdir}/usr/bin" "../../blend-settings"
-    install -Dm644 "../LICENSE.md" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+
+    install -Dm644 "${srcdir}/${pkgname%-git}.desktop" -t \
+        "${pkgdir}"/usr/share/applications/
+    install -Dm755 "${srcdir}/${pkgname%-git}" -t "${pkgdir}"/usr/bin/
 }