diff --git a/PKGBUILD b/PKGBUILD
index 68289ad..13ebcce 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,29 +6,29 @@ pkgrel=1
 pkgdesc="A project that provides support to some Bluetooth Cat Printer models, on many platforms!"
 arch=('any')
 url="https://github.com/NaitLee/Cat-Printer"
-license=('GPL3' 'MIT')
-depends=('python' 'bluez' 'bluez-utils' 'python-bleak')
-makedepends=('git')
+license=('GPL3')
+depends=('python' 'bluez' 'bluez-utils' 'python-bleak' 'ghostscript')
+makedepends=('git' 'unzip')
 provides=("cat-printer=${pkgver}")
-source=("$pkgname::git+https://github.com/NaitLee/Cat-Printer.git" "i18njs4$pkgname::git+https://github.com/roddeh/i18njs.git")
-md5sums=('SKIP' 'SKIP')
-sha256sums=('SKIP' 'SKIP')
+source=("$pkgname::git+https://github.com/NaitLee/Cat-Printer.git")
+md5sums=('SKIP')
+sha256sums=('SKIP')
 options=(!strip emptydirs)
 pkgver() {
   cd "$pkgname"
   printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
 }
+build() {
+  cd "$pkgname/build-common"
+  for i in $(find | grep -E '.*\.pyc'); do rm $i; done
+  python3 bundle.py -b "$pkgver"
+}
 package() {
     mkdir -p "$pkgdir/usr/bin"
-    mkdir -p "$pkgdir/usr/share/cat-printer"
-    cp -r "$srcdir/cat-printer-git"/* "$pkgdir/usr/share/cat-printer/"
-    cp -r "$srcdir/i18njs4cat-printer-git/dist/i18n.js" "$pkgdir/usr/share/cat-printer/www/i18n.js"
-    ln -s /usr/share/grub/unicode.pf2 "$pkgdir/usr/share/cat-printer/font.pf2"
-    rm -rf "$pkgdir/usr/share/cat-printer/build-"*
-    rm -rf "$pkgdir/usr/share/cat-printer/dev-diary.txt"
-    rm -rf "$pkgdir/usr/share/cat-printer/TODO"
-    rm -rf "$pkgdir/usr/share/cat-printer/systemd"
+    mkdir -p "$pkgdir/usr/share/"
     mkdir -p "$pkgdir/usr/lib/systemd/system/"
+    unzip "$srcdir/cat-printer-git/cat-printer-bare-$pkgver.zip" -d "$pkgdir/usr/share/"
+    ln -s /usr/share/grub/unicode.pf2 "$pkgdir/usr/share/cat-printer/font.pf2"
     install -m644 "$srcdir/cat-printer-git/systemd/cat-printer.service" "$pkgdir/usr/lib/systemd/system/"
     cat <<EOF > "$pkgdir/usr/bin/cat-printer"
 #!/bin/sh
@@ -42,4 +42,5 @@ cd /usr/share/cat-printer
 python3 server.py "\$@"
 EOF
     chmod +x "$pkgdir/usr/bin/cat-printer-server"
+    chmod +x "$pkgdir/usr/bin/cat-printer"
 }