diff --git a/PKGBUILD/PKGBUILD b/PKGBUILD/PKGBUILD
index 858d841..93733d6 100644
--- a/PKGBUILD/PKGBUILD
+++ b/PKGBUILD/PKGBUILD
@@ -1,42 +1,65 @@
 # Maintainer: Anton Hvornum anton@hvornum.se
 # Contributor: Anton Hvornum anton@hvornum.se
-pkgname="archinstall-gui"
-pkgver="0.1rc20"
-pkgdesc="A graphical installer for Arch Linux. Useful for Live CD's etc."
-pkgrel=1
+# Contributor: Fabian Bornschein plusfabi-cat-gmail-dog-com
+pkgbase=archinstall-gui
+pkgname=('archinstall-gui-server' 'archinstall-gui-standalone' 'archinstall-gui-desktop')
+pkgver=v0.1rc20
+pkgrel=2
 url="https://github.com/Torxed/archinstall_gui"
-archinstall_url="https://github.com/Torxed/archinstall.git"
 license=('GPLv3')
-provides=("${pkgname}")
-md5sums=('SKIP')
 arch=('x86_64')
-source=("${pkgname}-v${pkgver}-x86_64.tar.gz::https://github.com/Torxed/archinstall_gui/archive/v$pkgver.tar.gz")
-#depends=('python>=3.8' 'chromium' 'xorg-server' 'xorg-xinit' 'archinstall')
-depends=('python>=3.8' 'chromium' 'xorg-server' 'xorg-xinit')
-optdepends=('python-systemd: Adds more controlled logging functionality')
+makedepends=(git)
+_archinstall_commit=2c24903932342a32cdfa8c684547859116fb254e		# tags/v2.0.5
+_archinstall_gui_commit=2248aeb3099c296baf873c5e45aa181f09346189	# tags/v0.1rc20
+source=(git+https://github.com/Torxed/archinstall.git#commit=${_archinstall_commit}
+		git+https://github.com/Torxed/archinstall_gui.git#commit=${_archinstall_gui_commit}
+		archinstall-gui
+		archinstall_gui.service
+		archinstall_gui.svg
+		org.archlinux.archinstall_gui.desktop)
+sha256sums=('SKIP'
+            'SKIP'
+            '78ea37402accdb4584b0d48618add5f074bf353a29f85ad0cae4dd3a4b5be323'
+            'eb0acdf595173f97b7c1ef6ff92cd62c63fd4e0e7d870087c65b2f3f1bb6438c'
+            'f521e95c9882e86ed078c87ef6f3ab9c7f1ef3b5ecb9c350746cd07c5cbc107d'
+            '3943d9349c71456bf6bf72c90ba39a432f78df6dbe99969fa937bd14deee498f')
 
-package() {
-	# Will add this back when I've renamed the project upstream:
-	# cd "${pkgname}-${pkgver}"
-	cd "archinstall_gui-${pkgver}"
+pkgver() {
+  cd "archinstall_gui"
+  git describe --tags | sed 's/-/+/g'
+}
+
+package_archinstall-gui-server() {
+	pkgdesc="Server for a graphical installer for Arch Linux."
+	depends=('python>=3.8' 'systemd')
+	optdepends=('python-systemd: Adds more controlled logging functionality')
 
 	mkdir -p "${pkgdir}/srv/archinstall_gui"
 	mkdir -p "${pkgdir}/usr/bin"
-	mkdir -p "${pkgdir}/etc/systemd/system"
-
-	# PATCH: While we're working on a better shipping strat for archinstall,
-	# we'll have to git clone the repo manually. archinstall PKGBUILD currently builds and installs
-	# the binary version of archinstall for a more "standalone" approach, but we're 
-	# introducing optdepends for python>=3.8 which will build and install the library.
-	# After that, we can completely remove the submodule-requirement for archinstall in archinstall_gui.
-	# But until then, we'll have to manually clone it in in the wait for a dual-build release of archinstall PKGBUILD.
-	rm -rf archinstall_gui/dependencies/archinstall
-	git clone "${archinstall_url}" archinstall_gui/dependencies/archinstall
 
-	mv archinstall_gui/* "${pkgdir}/srv/archinstall_gui/"
-	mv PKGBUILD/archinstall-gui "${pkgdir}/usr/bin/archinstall-gui"
-	mv PKGBUILD/archinstall_gui.service "${pkgdir}/etc/systemd/system/archinstall_gui.service"
+	mv "${srcdir}/archinstall_gui/archinstall_gui"/* "${pkgdir}/srv/archinstall_gui/"
+	mv "${srcdir}/archinstall/archinstall" "${pkgdir}/srv/archinstall_gui/dependencies/"
 
 	chmod +x "${pkgdir}/srv/archinstall_gui/webgui.py"
-	chmod +x "${pkgdir}/usr/bin/archinstall-gui"
-}
\ No newline at end of file
+
+	install -Dm 644 "${srcdir}/archinstall_gui.service" \
+		"${pkgdir}/usr/lib/systemd/system/archinstall_gui.service"
+}
+
+package_archinstall-gui-standalone() {
+	pkgdesc="A graphical installer for Arch Linux."
+	depends=('archinstall-gui-server' 'chromium' 'xorg-server' 'xorg-xinit')
+
+	install -Dm 755 "${srcdir}/archinstall-gui" \
+		"${pkgdir}/usr/bin/archinstall-gui"
+}
+
+package_archinstall-gui-desktop() {
+	pkgdesc="A graphical installer for Arch Linux."
+	depends=('archinstall-gui-server' 'xdg-utils')
+
+	install -Dm 644 "${srcdir}/archinstall_gui.svg" \
+		"${pkgdir}/usr/share/pixmaps/archinstall_gui.svg"
+	install -Dm 644 "${srcdir}/org.archlinux.archinstall_gui.desktop" \
+		"${pkgdir}/usr/share/applications/org.archlinux.archinstall_gui.desktop"	
+}
diff --git a/PKGBUILD/archinstall_gui.svg b/PKGBUILD/archinstall_gui.svg
new file mode 100644
index 0000000..bf2461a
--- /dev/null
+++ b/PKGBUILD/archinstall_gui.svg
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg height="128px" viewBox="0 0 128 128" width="128px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <linearGradient id="a" gradientUnits="userSpaceOnUse">
+        <stop offset="0" stop-color="#d5d3cf"/>
+        <stop offset="0.0416667" stop-color="#e4e1de"/>
+        <stop offset="0.0833333" stop-color="#d5d3cf"/>
+        <stop offset="0.916667" stop-color="#d5d3cf"/>
+        <stop offset="0.958333" stop-color="#e4e1de"/>
+        <stop offset="1" stop-color="#d5d3cf"/>
+    </linearGradient>
+    <linearGradient id="b" x1="40.000001" x2="88.000001" xlink:href="#a" y1="105.499978" y2="105.499978"/>
+    <linearGradient id="c" gradientUnits="userSpaceOnUse" x1="51.00003049057" x2="77.00005067903" y1="99.50005987615" y2="99.50005987615">
+        <stop offset="0" stop-color="#d5d3cf"/>
+        <stop offset="0.00000002" stop-color="#e4e1de"/>
+        <stop offset="0.0384616" stop-color="#d5d3cf"/>
+        <stop offset="0.961538" stop-color="#d5d3cf"/>
+        <stop offset="1" stop-color="#e4e1de"/>
+        <stop offset="1" stop-color="#d5d3cf"/>
+    </linearGradient>
+    <filter id="d" height="100%" width="100%" x="0%" y="0%">
+        <feColorMatrix in="SourceGraphic" type="matrix" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
+    </filter>
+    <mask id="e">
+        <g filter="url(#d)">
+            <rect fill-opacity="0.25" height="128" width="128"/>
+        </g>
+    </mask>
+    <clipPath id="f">
+        <rect height="128" width="128"/>
+    </clipPath>
+    <linearGradient id="g" gradientUnits="userSpaceOnUse" x1="8.000001" x2="120.000001" y1="88.000001" y2="88.000001">
+        <stop offset="0" stop-color="#77767b"/>
+        <stop offset="0.0178571" stop-color="#c0bfbc"/>
+        <stop offset="0.0357143" stop-color="#9a9996"/>
+        <stop offset="0.964286" stop-color="#9a9996"/>
+        <stop offset="0.982143" stop-color="#c0bfbc"/>
+        <stop offset="1" stop-color="#77767b"/>
+    </linearGradient>
+    <linearGradient id="h" x1="40.000001" x2="88.000001" xlink:href="#a" y1="106.499986" y2="106.499986"/>
+    <linearGradient id="i" gradientUnits="userSpaceOnUse" x1="23.410384" x2="71.177697" y1="23.938592" y2="61.657266">
+        <stop offset="0" stop-color="#fefeff" stop-opacity="0.251"/>
+        <stop offset="1" stop-color="#f7f7f7" stop-opacity="0"/>
+    </linearGradient>
+    <path d="m 12 18 c -2.242188 0 -4 1.796875 -4 4 v 62 c 0 2.25 1.722656 4 4 4 h 104 c 2.34375 0 4 -1.722656 4 -4 v -62 c 0 -2.203125 -1.757812 -4 -4 -4 c -2 0 -102 0 -104 0 z m 0 0" fill="#424048"/>
+    <path d="m 44 103 c -2 0 -4 1.734375 -4 4 v 1 h 0.148438 c 0.480468 -1.753906 2.160156 -3 3.851562 -3 h 40 c 2.03125 -0.007812 3.484375 1.21875 3.882812 3 h 0.117188 v -1 c 0 -2.308594 -1.605469 -4.007812 -4 -4 z m 0 0" fill="url(#b)"/>
+    <path d="m 51 92 h 26 v 15 h -26 z m 0 0" fill="url(#c)"/>
+    <path d="m 44 105 c -2 0 -4 1.734375 -4 4 v 1 h 48 v -1 c 0 -2.308594 -1.605469 -4.007812 -4 -4 c -1 0 -39 0 -40 0 z m 0 0" fill="#c0bfbc"/>
+    <path d="m 10 20 h 108 v 61 h -108 z m 0 0" fill="#1793d1"/>
+    <g clip-path="url(#f)" mask="url(#e)">
+        <path d="m 51 92 h 26 v 3 h -26 z m 0 0"/>
+    </g>
+    <path d="m 63.996094 34 c -1.421875 3.492188 -2.28125 5.777344 -3.867188 9.164062 c 0.96875 1.03125 2.164063 2.230469 4.101563 3.585938 c -2.082031 -0.855469 -3.503907 -1.71875 -4.566407 -2.609375 c -2.03125 4.234375 -5.210937 10.265625 -11.664062 21.859375 c 5.074219 -2.929688 9.003906 -4.734375 12.667969 -5.421875 c -0.15625 -0.675781 -0.246094 -1.410156 -0.238281 -2.171875 l 0.003906 -0.164062 c 0.082031 -3.246094 1.769531 -5.746094 3.773437 -5.578126 c 2.003907 0.171876 3.558594 2.945313 3.480469 6.195313 c -0.015625 0.609375 -0.085938 1.199219 -0.207031 1.742187 c 3.625 0.710938 7.515625 2.511719 12.519531 5.398438 c -0.988281 -1.816406 -1.867188 -3.453125 -2.707031 -5.011719 c -1.324219 -1.027343 -2.707031 -2.363281 -5.527344 -3.808593 c 1.9375 0.503906 3.324219 1.082031 4.40625 1.730468 c -8.550781 -15.914062 -9.242187 -18.03125 -12.175781 -24.910156 z m 0 0" fill="#ffffff" fill-rule="evenodd"/>
+    <path d="m 8 84 v 4 c 0 2.25 1.722656 4 4 4 h 104 c 2.34375 0 4 -1.722656 4 -4 v -4 c 0 2.277344 -1.65625 4 -4 4 h -104 c -2.277344 0 -4 -1.75 -4 -4 z m 0 0" fill="url(#g)"/>
+    <path d="m 44 104 c -2 0 -4 1.734375 -4 4 v 1 c 0 -2.265625 2 -4 4 -4 h 40 c 2.394531 -0.007812 4 1.691406 4 4 v -1 c 0 -2.308594 -1.605469 -4.007812 -4 -4 z m 0 0" fill="url(#h)"/>
+    <path d="m 12 18 c -2.242188 0 -4 1.796875 -4 4 v 62 c 0 2.25 1.722656 4 4 4 h 104 c 2.34375 0 4 -1.722656 4 -4 v -62 c 0 -2.203125 -1.757812 -4 -4 -4 c -2 0 -102 0 -104 0 z m 0 0" fill="url(#i)"/>
+</svg>
diff --git a/PKGBUILD/org.archlinux.archinstall_gui.desktop b/PKGBUILD/org.archlinux.archinstall_gui.desktop
new file mode 100644
index 0000000..51ab30e
--- /dev/null
+++ b/PKGBUILD/org.archlinux.archinstall_gui.desktop
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Version=1.0.0
+Type=Application
+Terminal=false
+Exec=/usr/bin/xdg-open http://127.0.0.1  
+TryExec=/usr/bin/xdg-open
+Name=Install Arch Linux
+Name[de]=Arch Linux Installieren
+Comment=Installation tool
+Icon=archinstall_gui.svg