diff --git a/PKGBUILD b/PKGBUILD
index cb70300..2538755 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,58 +1,57 @@
 # Maintainer: Rick van Lieshout <info@rickvanlieshout.com>
 
-_pkgname=tidal-hifi
-pkgname="$_pkgname-git"
-pkgver=2.2.1
-pkgrel=2
+pkgname=tidal-hifi-git
+pkgrel=1
+pkgver=2.3.0.r0.g8fea526
 pkgdesc="The web version of listen.tidal.com running in electron with hifi support thanks to widevine."
-arch=("x86_64")
+arch=(x86_64)
 url="https://github.com/Mastermindzh/tidal-hifi"
 license=("custom:MIT")
+depends=(libxss nss gtk3)
+makedepends=(npm git)
+provides=(tidal-hifi)
+conflicts=(tidal-hifi)
 
-depends=("libxss" "nss" "gtk3")
-makedepends=("npm" "git")
-provides=("$_pkgname")
+source=("git+https://github.com/Mastermindzh/tidal-hifi.git"
+        "tidal-hifi.desktop")
+sha512sums=('SKIP'
+            '31cf40fb3ac81c4a64a8410a78e97c268a440577bce54347ce62f8a9566c8897f8083cd1e5afa40b0fbe9a149fc4fb4f29cad91a12e5b47cf8e300e56351a4f1')
 
-source=("https://github.com/Mastermindzh/tidal-hifi/archive/$pkgver.zip"
-        "${_pkgname}.desktop")
-sha512sums=('adf126bb23945deca1f3cc5e50b53422d442096726f6b77c7490fc3fcd6af809502750d1670ef26c7ab019f1b31e6bf8fa59274bdc9a8be6779caa73c7f50cc9'
-            'd7e283e841aa0ba8189d56c090f01aaa7fe2b187756a6d037d1412e698ff586aef45698c5cb89c36fe22f403885060e65fef98be9f8807ac1e6878d8fca686eb')
-
-cdToPkg(){
-    cd "tidal-hifi-$pkgver"
+pkgver() {
+    cd "${srcdir}/${pkgname%-git}"
+    git describe --long --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g'
 }
 
 prepare() {
-    cdToPkg
+    cd "${srcdir}/${pkgname%-git}"
 
     # install build dependencies
     npm install
 }
 
 build() {
-    cdToPkg
+    cd "${srcdir}/${pkgname%-git}"
 
     # We are not using the systems Electron as we need castlab's Electron.
     npm run build-arch
 }
 
 package() {
-    cdToPkg
+    cd "${srcdir}/${pkgname%-git}"
 
-    install -d "${pkgdir}/opt/${_pkgname}/" "${pkgdir}/usr/bin" "${pkgdir}/usr/share/doc" "${pkgdir}/usr/share/licenses"
+    install -d "${pkgdir}/opt/tidal-hifi/" "${pkgdir}/usr/bin" "${pkgdir}/usr/share/doc" "${pkgdir}/usr/share/licenses"
 
-    cp -r dist/linux-unpacked/* "${pkgdir}/opt/${_pkgname}/"
-    chmod +x "${pkgdir}/opt/${_pkgname}/${_pkgname}"
+    cp -r dist/linux-unpacked/* "${pkgdir}/opt/tidal-hifi/"
+    chmod +x "${pkgdir}/opt/tidal-hifi/tidal-hifi"
 
-    ln -s "/opt/${_pkgname}/${_pkgname}" "${pkgdir}/usr/bin/${_pkgname}"
+    ln -s "/opt/tidal-hifi/tidal-hifi" "${pkgdir}/usr/bin/tidal-hifi"
 
-    install -Dm 644 "build/icon.png" "${pkgdir}/usr/share/pixmaps/${_pkgname}.png"
-    install -Dm 644 "build/icon.png" "${pkgdir}/usr/share/icons/hicolor/0x0/apps/tidal-hifi.png"
-    install -Dm 644 "${srcdir}/${_pkgname}.desktop" "${pkgdir}/usr/share/applications/${_pkgname}.desktop"
+    install -Dm 644 "build/icon.png" "${pkgdir}/usr/share/pixmaps/tidal-hifi.png"
+    install -Dm 644 "${srcdir}/tidal-hifi.desktop" "${pkgdir}/usr/share/applications/tidal-hifi.desktop"
 
     install -Dm 644 "README.md" "${pkgdir}/usr/share/doc/${pkgname}/README.md"
     install -Dm 644 "LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-    
-    ln -s "/opt/${_pkgname}/LICENSE.electron.txt" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE.electron.txt"
-    ln -s "/opt/${_pkgname}/LICENSES.chromium.html" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSES.chromium.html"
+#    install -dm755 "icon.png" "${pkgdir}/usr/share/pixmaps/tidal-hifi.png"
+    ln -s "/opt/tidal-hifi/LICENSE.electron.txt" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE.electron.txt"
+    ln -s "/opt/tidal-hifi/LICENSES.chromium.html" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSES.chromium.html"
 }
diff --git a/tidal-hifi.desktop b/tidal-hifi.desktop
index a8a80a7..7179307 100644
--- a/tidal-hifi.desktop
+++ b/tidal-hifi.desktop
@@ -10,4 +10,4 @@ Terminal=false
 Type=Application
 Categories=Network;Application;Audio;Video
 StartupWMClass=tidal-hifi
-X-PulseAudio-Properties=media.role=music
+X-PulseAudio-Properties=media.role=music
\ No newline at end of file