diff --git a/.SRCINFO b/.SRCINFO
index 99a3215..5f9b9fc 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,23 +1,24 @@
 pkgbase = escribe-suite-bin
 	pkgdesc = Evolv eScribe Suite - DNA Management Suite and Ecigstats - INTL Version
-	pkgver = 2_SP68
-	pkgrel = 1
+	pkgver = 2_SP71
+	pkgrel = 3
 	url = https://forum.evolvapor.com/topic/69197-linux-escribe-suite-beta-thread/
 	arch = x86_64
 	license = LicenseRef-custom
 	makedepends = unzip
+	depends = bash
+	depends = gtk3
+	depends = mono
 	optdepends = hardinfo: For system information utility
-	source = https://downloads.evolvapor.com/SetupEScribe2_SP68_INT.run
+	source = https://downloads.evolvapor.com/SetupEScribe2_SP71_INT.run
 	source = escribe-suite-bin.sh
 	source = escribe-suite-bin.desktop
 	source = ecigstats.desktop
-	b2sums = cc6cbbd8a8a8be361fc7afa154e36ee76410356b48a51d71057ebfc21f954ecca830884b47fe5cd7e3f98038f0c1c0319d64718d975827ea425a7b811a96a464
+	source = icons.tar.gz
+	b2sums = c382bfaabb7f998814090217fd8e7a2cb11b5df712f7a1b82029752e9474e46ea6ea91370c35b2e6c9ba5607e91018ffb586cacaf5fd5cc350e6b67709d277ca
 	b2sums = 2151c44c156dff69c9ade3884ca061bfac58ec3b6c886d5ca73ad7317b65034bc3c220d8b916454a6487085457c786e3a95f5971110432ccabd6959497cd8a47
-	b2sums = 01fe26868c534d6b749243c1fc6d30ef0693bf516235efcefa342f36114eecb6db87364fd63c5641a4b031d4f01c2dc88a14d6e92bd4213ad70328388c331277
-	b2sums = 457e5c7be94b76038967a04cf586cdbbb66331fdcb9dac841d2b1f1773374e1dec6e664f1e6a48732df81622c21e0f16c7cd63c25d3f74732d66abf043975d59
+	b2sums = e1da9fab6386571ae2a3300acd3439df2c7dea712786155f58f8917b669d8378d7e13b664716cfb6e299c197091bffbe643b5cd0bb41bf73f11eec425fe2362d
+	b2sums = c4331fac8b73a99b87bcab4a8f9cdb4d506402887919778c661b2003c402eb0e58e5b6fc43282983678968d920bd096e6d4fbd8f130890819724f340dadfb1cd
+	b2sums = 3ff2f6322e9e291028a2c7b3ffab5b4de9984ff8d1a2c0f69f7e9eea60e5bfecf785726fcbdd25632d6c90042560b4c7fc686139e257829e9f91256562f77c29
 
 pkgname = escribe-suite-bin
-	depends = bash
-	depends = gtk2
-	depends = gtk-sharp-2
-	depends = mono
diff --git a/.gitignore b/.gitignore
index 0c14fda..6cf3153 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,3 +16,4 @@
 !REUSE.toml
 !*.desktop
 !escribe-suite-bin.sh
+!icons.tar.gz
diff --git a/PKGBUILD b/PKGBUILD
index 92cd6f9..2908256 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,28 +2,39 @@
 # Contributor: Khorne <khorne@khorne.me>
 
 pkgname=escribe-suite-bin
-pkgver=2_SP68
-pkgrel=1
+pkgver=2_SP71
+pkgrel=3
 pkgdesc="Evolv eScribe Suite - DNA Management Suite and Ecigstats - INTL Version"
 arch=('x86_64')
 url="https://forum.evolvapor.com/topic/69197-linux-escribe-suite-beta-thread/"
 license=(
     LicenseRef-custom
 )
+
+depends=(
+    bash
+    gtk3
+    #gtk-sharp-3
+    mono
+)
 makedepends=(
     unzip
 )
 optdepends=(
     'hardinfo: For system information utility'
 )
-source=("https://downloads.evolvapor.com/SetupEScribe${pkgver//./_}_INT.run"
-        "escribe-suite-bin.sh"
-        "escribe-suite-bin.desktop"
-        "ecigstats.desktop")
-b2sums=('cc6cbbd8a8a8be361fc7afa154e36ee76410356b48a51d71057ebfc21f954ecca830884b47fe5cd7e3f98038f0c1c0319d64718d975827ea425a7b811a96a464'
+source=(
+    "https://downloads.evolvapor.com/SetupEScribe${pkgver//./_}_INT.run"
+    "escribe-suite-bin.sh"
+    "escribe-suite-bin.desktop"
+    "ecigstats.desktop"
+    "icons.tar.gz"
+)
+b2sums=('c382bfaabb7f998814090217fd8e7a2cb11b5df712f7a1b82029752e9474e46ea6ea91370c35b2e6c9ba5607e91018ffb586cacaf5fd5cc350e6b67709d277ca'
         '2151c44c156dff69c9ade3884ca061bfac58ec3b6c886d5ca73ad7317b65034bc3c220d8b916454a6487085457c786e3a95f5971110432ccabd6959497cd8a47'
-        '01fe26868c534d6b749243c1fc6d30ef0693bf516235efcefa342f36114eecb6db87364fd63c5641a4b031d4f01c2dc88a14d6e92bd4213ad70328388c331277'
-        '457e5c7be94b76038967a04cf586cdbbb66331fdcb9dac841d2b1f1773374e1dec6e664f1e6a48732df81622c21e0f16c7cd63c25d3f74732d66abf043975d59')
+        'e1da9fab6386571ae2a3300acd3439df2c7dea712786155f58f8917b669d8378d7e13b664716cfb6e299c197091bffbe643b5cd0bb41bf73f11eec425fe2362d'
+        'c4331fac8b73a99b87bcab4a8f9cdb4d506402887919778c661b2003c402eb0e58e5b6fc43282983678968d920bd096e6d4fbd8f130890819724f340dadfb1cd'
+        '3ff2f6322e9e291028a2c7b3ffab5b4de9984ff8d1a2c0f69f7e9eea60e5bfecf785726fcbdd25632d6c90042560b4c7fc686139e257829e9f91256562f77c29')
 prepare() {
 	chmod +x "SetupEScribe${pkgver//./_}_INT.run"
 	./"SetupEScribe${pkgver//./_}_INT.run" --target . --noexec
@@ -34,12 +45,6 @@ prepare() {
 }
 
 package() {
-    depends=(
-        bash
-        gtk2
-        gtk-sharp-2
-        mono
-    )
     mkdir -p "${pkgdir}/opt/${pkgname}"
     cp -r common/data/* "${pkgdir}/opt/${pkgname}"
 
@@ -51,6 +56,7 @@ package() {
     install -Dm0644 "${pkgname}.desktop" "${pkgdir}/usr/share/applications/${pkgname}.desktop"
     install -Dm0644 "ecigstats.desktop" "${pkgdir}/usr/share/applications/ecigstats.desktop"
     install -Dm0755 "${pkgname}.sh" "${pkgdir}/usr/bin/escribe-suite"
+    mv -f icons "${pkgdir}/usr/share"
 }
 
 # vim: set ft=sh ts=4 sw=4 et:
diff --git a/REUSE.toml b/REUSE.toml
index c18213d..f4a9023 100644
--- a/REUSE.toml
+++ b/REUSE.toml
@@ -19,6 +19,7 @@ path = [
     "*.desktop",
     "*.hook",
     "escribe-suite-bin.sh",
+    "icons.tar.gz"
 ]
 SPDX-FileCopyrightText = "Arch Linux contributors"
 SPDX-License-Identifier = "0BSD"
diff --git a/ecigstats.desktop b/ecigstats.desktop
index dec05ec..8619138 100644
--- a/ecigstats.desktop
+++ b/ecigstats.desktop
@@ -5,8 +5,8 @@ Type=Application
 Name=ECigStats
 GenericName=ECigStats
 Comment=Help tell the true story of electronic cigarettes
-Icon=accessories-calculator
+Icon=ecigstats
 Exec=mono /opt/escribe-suite-bin/components/ecigstats.exe
-Categories=Science
+Categories=GTK;Science;DataVisualization;
 Path=/opt/escribe-suite-bin/
 
diff --git a/escribe-suite-bin.desktop b/escribe-suite-bin.desktop
index 9331202..3675556 100644
--- a/escribe-suite-bin.desktop
+++ b/escribe-suite-bin.desktop
@@ -3,5 +3,5 @@ Name=EScribe Suite
 Comment=DNA Management Suite + ECigStats
 Exec=mono /opt/escribe-suite-bin/main/EScribe.exe
 Type=Application
-Icon=/opt/escribe-suite-bin/main/Pictures/Theme Designer/Evolv DNA Color/Miscellaneous/Evolv Symbol Dark Large.png
-Categories=Tools;
+Icon=escribe
+Categories=GTK;Utility;HardwareSettings;
diff --git a/icons.tar.gz b/icons.tar.gz
new file mode 100644
index 0000000..5ebee87
Binary files /dev/null and b/icons.tar.gz differ