diff --git a/.SRCINFO b/.SRCINFO
new file mode 100644
index 0000000..a59ed67
--- /dev/null
+++ b/.SRCINFO
@@ -0,0 +1,27 @@
+pkgbase = grub-theme-live-tromjaro
+	pkgdesc = TROMjaro Linux grub theme
+	pkgver = 18.0
+	pkgrel = 1
+	url = https://gitlab.com/tromsite/tromjaro/grub-theme
+	arch = any
+	license = GPL
+	makedepends = git
+	source = grub-theme::git+https://gitlab.com/tromsite/tromjaro/grub-theme.git#commit=338f17aca67f1a78c6a7dddd672b700c0fba7123
+	sha256sums = SKIP
+
+pkgname = grub-theme-live-common
+	depends = grub
+	conflicts = grub-theme-live-dev
+
+pkgname = grub-theme-live-tromjaro
+	depends = grub-theme-live-common
+	conflicts = grub-theme-live-common-dev
+	conflicts = grub-theme-live-manjaro
+
+pkgname = grub-theme-tromjaro
+	install = tromjaro-theme.install
+	depends = grub
+	conflicts = grub-theme-tromjaro-dev
+	conflicts = grub-theme-manjaro
+	conflicts = grub-theme-manjaro-dev
+
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..5528ea6
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,6 @@
+*
+
+!.gitignore
+!.SRCINFO
+!PKGBUILD
+!tromjaro-theme.install
\ No newline at end of file
diff --git a/PKGBUILD b/PKGBUILD
index 7296e6f..6eb65d9 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: davedatum <trom@davedatum.com>
 
 pkgbase=grub-theme-live-tromjaro
-pkgname=('grub-theme-live-common-tromjaro' 'grub-theme-live-tromjaro' 'grub-theme-tromjaro')
+pkgname=('grub-theme-live-common' 'grub-theme-live-tromjaro' 'grub-theme-tromjaro')
 pkgver=18.0
 pkgrel=1
 
@@ -10,18 +10,18 @@ arch=('any')
 url="https://gitlab.com/tromsite/tromjaro/grub-theme"
 license=('GPL')
 makedepends=('git')
-source=("grub-theme::git+$url.git")
+source=("grub-theme::git+$url.git#commit=338f17aca67f1a78c6a7dddd672b700c0fba7123")
 sha256sums=('SKIP')
 
-package_grub-theme-live-common-tromjaro() {
+package_grub-theme-live-common() {
     depends=('grub')
-    conflicts=('grub-theme-live-dev' 'grub-theme-live-common')
+    conflicts=('grub-theme-live-dev')
 
     cd grub-theme
     make PREFIX=/usr DESTDIR=${pkgdir} install_common
 }
 package_grub-theme-live-tromjaro() {
-    depends=('grub-theme-live-common-tromjaro')
+    depends=('grub-theme-live-common')
 	conflicts=('grub-theme-live-common-dev' 'grub-theme-live-manjaro')
 	
     cd grub-theme