diff --git a/repo/vdhcoapp-bin/PKGBUILD b/repo/vdhcoapp-bin/PKGBUILD
index b686bb8..78058cd 100644
--- a/repo/vdhcoapp-bin/PKGBUILD
+++ b/repo/vdhcoapp-bin/PKGBUILD
@@ -2,47 +2,42 @@
 # Contributor: Mario Ray MahardhikZza <leledumbo_cool@yahoo.co.id>
 # Contributor: James Cuzella <james.cuzella@lyraphase.com>
 
-_package=net.downloadhelper.coapp
-pkgname=vdhcoapp-bin
+_pkgname=vdhcoapp
+pkgname="$_pkgname-bin"
 pkgver=2.0.19
-pkgrel=1
-pkgdesc="Companion application for Video DownloadHelper browser add-on, precompiled binary version"
-provides=("vdhcoapp=${pkgver}")
-conflicts=('vdhcoapp')
+pkgrel=2
 arch=('x86_64')
+pkgdesc="Companion application for Video DownloadHelper browser add-on (binary version)"
 url="https://github.com/aclap-dev/vdhcoapp"
-license=('GPL2')
-depends=('ffmpeg' 'orc')
-makedepends=()
-options=('!strip') # IMPORTANT! DO NOT REMOVE THIS, OTHERWISE THE BINARY WILL BE BROKEN!
-source=(vdhcoapp-$pkgver-linux-$arch.deb::https://github.com/aclap-dev/vdhcoapp/releases/download/v${pkgver}/vdhcoapp-linux-$arch.deb
-        vdhcoapp-install.hook
-        vdhcoapp-remove.hook
-        vdhcoapp-user-install.hook
-        vdhcoapp-user-remove.hook)
-sha256sums=('496d341eef326f3fb6f0ddf825b309d6e18a4ddb7f1bec7fe74d9282ae94dfc4'
-            'a2b56e6ae3f7f8933e20762baa90e69f63f0802b2e6d213b51e0bc68843e5d27'
-            '3287859986d67e15e269965676bf9c75d1e853ea0ec97695811072fb8f10a7a8'
-            'a08c02d934709cdea4392fce155bec0b33147e386ed154bed959c5b78788ea83'
-            'f7406ae5ba7fb6602426ef97540f86e057a7fd6d01a917e5af3638f1d64b2ce9')
+license=('GPL-2.0-or-later')
+
+options=('emptydirs' '!strip') # IMPORTANT! DO NOT REMOVE THIS, OTHERWISE THE BINARY WILL BE BROKEN!
+install="$_pkgname.install"
+
+provides=("vdhcoapp=$pkgver")
+conflicts=('vdhcoapp')
+
+source=("$_pkgname-$pkgver-linux-$arch.deb::https://github.com/aclap-dev/$_pkgname/releases/download/v${pkgver}/$_pkgname-linux-$arch.deb")
+
+sha256sums=('496d341eef326f3fb6f0ddf825b309d6e18a4ddb7f1bec7fe74d9282ae94dfc4')
 
 prepare() {
-  rm control.tar.xz
-  rm debian-binary
-  mkdir -p "${srcdir}/${pkgname}"
-  tar xf data.tar.xz -C "${pkgname}"
+  mkdir -p "$srcdir/$pkgname"
 }
 
 package() {
-  cp -Rfp "${srcdir}/${pkgname}/"* "${pkgdir}/"
-  mkdir -p "${pkgdir}/usr/bin"
-  mkdir -p "${pkgdir}/usr/share/libalpm/hooks"
-  mkdir -p "${pkgdir}/opt/${_package}/converter/build/linux/64/"
-  ln -s /usr/bin/ffmpeg "${pkgdir}/opt/${_package}/converter/build/linux/64/ffmpeg"
-  ln -s /usr/bin/ffprobe "${pkgdir}/opt/${_package}/converter/build/linux/64/ffprobe"
-  ln -s /usr/bin/ffplay "${pkgdir}/opt/${_package}/converter/build/linux/64/ffplay"
-  ln -s "/opt/vdhcoapp/vdhcoapp" "${pkgdir}/usr/bin/vdhcoapp"
+  depends+=('ffmpeg')
 
-  # Install Hooks
-  cp -fpL "${srcdir}/"*.hook "${pkgdir}/usr/share/libalpm/hooks/"
+  tar xf data.tar.xz -C "$pkgdir" "./opt/$_pkgname/filepicker" "./opt/$_pkgname/$_pkgname"
+
+  ln -sf /usr/bin/ffmpeg "${pkgdir}/opt/$_pkgname/ffmpeg"
+  ln -sf /usr/bin/ffprobe "${pkgdir}/opt/$_pkgname/ffprobe"
+
+  install -dm755 "$pkgdir/usr/bin"
+  ln -sf "/opt/vdhcoapp/vdhcoapp" "${pkgdir}/usr/bin/vdhcoapp"
+
+  install -dm755 "$pkgdir/usr/lib/mozilla/native-messaging-hosts/"
+  install -dm755 "$pkgdir/etc/opt/chrome/native-messaging-hosts/"
+  install -dm755 "$pkgdir/etc/chromium/native-messaging-hosts/"
+  install -dm755 "$pkgdir/etc/opt/edge/native-messaging-hosts/"
 }
diff --git a/repo/vdhcoapp-bin/vdhcoapp-install.hook b/repo/vdhcoapp-bin/vdhcoapp-install.hook
deleted file mode 100644
index b608634..0000000
--- a/repo/vdhcoapp-bin/vdhcoapp-install.hook
+++ /dev/null
@@ -1,10 +0,0 @@
-[Trigger]
-Operation = Install
-Operation = Upgrade
-Type = Package
-Target = vdhcoapp-bin
-
-[Action]
-Description = Installing JSON configuration file ...
-When = PostTransaction
-Exec = /usr/bin/vdhcoapp install --system
diff --git a/repo/vdhcoapp-bin/vdhcoapp-remove.hook b/repo/vdhcoapp-bin/vdhcoapp-remove.hook
deleted file mode 100644
index ddf2690..0000000
--- a/repo/vdhcoapp-bin/vdhcoapp-remove.hook
+++ /dev/null
@@ -1,9 +0,0 @@
-[Trigger]
-Operation = Remove
-Type = Package
-Target = vdhcoapp-bin
-
-[Action]
-Description = Uninstalling JSON configuration file ...
-When = PreTransaction
-Exec = /usr/bin/vdhcoapp uninstall --system
diff --git a/repo/vdhcoapp-bin/vdhcoapp-user-install.hook b/repo/vdhcoapp-bin/vdhcoapp-user-install.hook
deleted file mode 100644
index 2afad2e..0000000
--- a/repo/vdhcoapp-bin/vdhcoapp-user-install.hook
+++ /dev/null
@@ -1,10 +0,0 @@
-[Trigger]
-Operation = Install
-Operation = Upgrade
-Type = Package
-Target = vdhcoapp-bin
-
-[Action]
-Description = Installing JSON configuration file for current user ...
-When = PostTransaction
-Exec = /bin/sh -c 'sudo -u "${SUDO_USER:-$(id -u -n 1000 )}" /usr/bin/vdhcoapp install --user'
diff --git a/repo/vdhcoapp-bin/vdhcoapp-user-remove.hook b/repo/vdhcoapp-bin/vdhcoapp-user-remove.hook
deleted file mode 100644
index c0f15dd..0000000
--- a/repo/vdhcoapp-bin/vdhcoapp-user-remove.hook
+++ /dev/null
@@ -1,9 +0,0 @@
-[Trigger]
-Operation = Remove
-Type = Package
-Target = vdhcoapp-bin
-
-[Action]
-Description = Uninstalling JSON configuration file for current user ...
-When = PreTransaction
-Exec = /bin/sh -c 'sudo -u "${SUDO_USER:-$(id -u -n 1000 )}" /usr/bin/vdhcoapp uninstall --user'
diff --git a/repo/vdhcoapp-bin/vdhcoapp.install b/repo/vdhcoapp-bin/vdhcoapp.install
new file mode 100644
index 0000000..847fee9
--- /dev/null
+++ b/repo/vdhcoapp-bin/vdhcoapp.install
@@ -0,0 +1,14 @@
+post_install() {
+  echo "vdhcoapp: system install"
+  vdhcoapp install --system
+}
+
+post_upgrade() {
+  echo "vdhcoapp: system install"
+  vdhcoapp install --system
+}
+
+pre_remove() {
+  echo "vdhcoapp: system uninstall"
+  vdhcoapp uninstall --system
+}