diff --git a/AdminScripts/shadowarch-sync b/AdminScripts/shadowarch-sync
index a567824..1908bb3 100644
--- a/AdminScripts/shadowarch-sync
+++ b/AdminScripts/shadowarch-sync
@@ -9,19 +9,17 @@
 # 
 # Author: DarkFeather <darkfeather@aninix.net>
 
-# seconds=10
-# echo "This will sync your /etc files with the AniNIX defaults and add the AniNIX
-# GPG key for pacman." 
-# echo "Proceeding in $seconds seconds. Is this OK? [YES/no] " 
-# timeout $seconds cat | read answer
-# if [[ "${answer,,}" =~ ^n ]]; then
-#     exit 0;
-# fi
+seconds=10
+echo "Syncing in $seconds seconds. Press Ctrl+C to cancel."
+sleep $seconds
 
-rsync -avz /opt/aninix/ShadowArch/etc/ /etc/
-keyid=D9DC5933A1B0D4F7
+# AniNIX GPG Package Signing
+keyid=1CC1E3F4ED06F296
 if ! gpg --homedir /etc/pacman.d/gnupg --list-key "${keyid}"; then
-    pacman-key --add /usr/share/pacman/keyrings/aninix.gpg
+    pacman-key --recv-key "${keyid}"
     pacman-key --finger "${keyid}"
     pacman-key --lsign-key "${keyid}"
 fi
+
+# Sync configuration
+rsync -avz /opt/aninix/ShadowArch/etc/ /etc/
diff --git a/Makefile b/Makefile
index c57c332..a06058d 100644
--- a/Makefile
+++ b/Makefile
@@ -5,7 +5,6 @@ compile: ${LIST}
 
 install: compile 
 	mkdir -p ${pkgdir}/usr/share/pacman/keyrings
-	cp ./aninix.gpg ${pkgdir}/usr/share/pacman/keyrings
 	for i in ${LIST}; do make -C ./$$i install; done
 
 reverse: 
diff --git a/PKGBUILD b/PKGBUILD
index 1d91e2c..afceca8 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,23 +1,22 @@
-# Maintainer: Shikoba Kage <darkfeather@aninix.net>
-pkgname="$(git config remote.origin.url | rev | cut -f 1 -d '/' | rev | sed 's/.git$//' | tr '[[:upper:]]' '[[:lower:]]')"
+depends=('curl' 'grep' 'bash>=4.4' 'git>=2.13')
+makedepends=('make>=4.2')
+checkdepends=()
+optdepends=()
+pkgname="$(git config remote.origin.url | rev | cut -f 1 -d '/' | rev | sed 's/.git$//')"
 pkgver="$(git describe --tag --abbrev=0)"."$(git rev-parse --short HEAD)"
 pkgrel=1
 pkgrel() { 
-    git log "$(git describe --tag --abbrev=0)"..HEAD | grep -c commit
+    echo $(( `git log "$(git describe --tag --abbrev=0)"..HEAD | grep -c commit` + 1 ))
 }
-epoch=
+epoch="$(git log | grep -c commit)"
 pkgdesc="$(head -n 1 README)"
 arch=("x86_64")
 url="https://aninix.net/foundation/${pkgname}"
 license=('custom')
 groups=()
-depends=('curl' 'grep' 'bash>=4.4' 'git>=2.13')
-makedepends=('make>=4.2')
-checkdepends=()
-optdepends=()
-provides=('shadowarch')
+provides=("${pkgname}")
 conflicts=()
-replaces=('aninix-misc-scripts')
+replaces=("${pkgname,,}", "aninix-${pkgname,,}")
 backup=()
 options=()
 install=
@@ -36,7 +35,8 @@ build() {
 }
 
 check() {
-	printf 'quit\n\n' | make -C .. test
+    chmod -R u+r ../pkg
+	make -C .. test
 }
 
 package() {
diff --git a/aninix.gpg b/aninix.gpg
deleted file mode 100755
index 1c3ab41..0000000
Binary files a/aninix.gpg and /dev/null differ