diff --git a/device/device-amazon-thor/90-android-touch-dev.rules b/device/device-amazon-thor/90-android-touch-dev.rules
deleted file mode 100755
index 5e944bce3..000000000
--- a/device/device-amazon-thor/90-android-touch-dev.rules
+++ /dev/null
@@ -1,3 +0,0 @@
-# Touchscreen
-SUBSYSTEM=="input", ATTRS{name}=="synaptics_dsx_i2c", \
-ENV{ID_INPUT}="1", ENV{ID_INPUT_TOUCHSCREEN}="1"
\ No newline at end of file
diff --git a/device/device-amazon-thor/APKBUILD b/device/device-amazon-thor/APKBUILD
index deb06216f..61ec8a6e1 100755
--- a/device/device-amazon-thor/APKBUILD
+++ b/device/device-amazon-thor/APKBUILD
@@ -1,30 +1,27 @@
 pkgname=device-amazon-thor
 pkgver=1
-pkgrel=7
+pkgrel=8
 pkgdesc="Amazon KFHDX 7inch 2013"
 url="https://github.com/postmarketOS"
 arch="noarch"
 license="MIT"
 depends="postmarketos-base linux-amazon-thor mkbootimg msm-fb-refresher mesa-dri-swrast"
-makedepends=""
-install="$pkgname.post-install"
+makedepends="devicepkg-dev"
+install=""
 subpackages=""
 source="
 	deviceinfo
-	90-android-touch-dev.rules
 	fb.modes
 "
 options="!check"
 
+build() {
+	devicepkg_build $startdir $pkgname
+}
+
 package() {
-	install -D -m644 "$srcdir/deviceinfo" \
-		"$pkgdir/etc/deviceinfo"
-	install -D -m644 "$srcdir"/90-android-touch-dev.rules \
-		"$pkgdir"/etc/udev/rules.d/90-android-touch-dev.rules
-	install -Dm644 "$srcdir"/fb.modes \
-		"$pkgdir"/etc/fb.modes
+	devicepkg_package $startdir $pkgname
 }
 
 sha512sums="72f3e47ae416b625d0c82d0450dc3260675978ba3817fd6a157bcae8caacd6ea86364f525a11297bf6d4909846eecbff256119af940cffac99bcf7aa9abb1788  deviceinfo
-7ed015f42c445cbfa34a26ec33da8d72bcba818eecd3fae91fb418132472e739edaeed021e942d30f7d64593ffe17b61bc75e89fd45ffc44c2cdf0d1827942cb  90-android-touch-dev.rules
-762d712485f581113dd70bf2a4e0602f8b9ac8c05cf519ffc2d9a4a5c7bdb387c150cee087e7523e90f598c0cde3dce89975dadc2d651b770f7f80e480848ed4  fb.modes"
+e96725e631ba474980274266fd5af85c72fcd31543d0b5f5dbe7bd610f9650f881708a41887d61ba3e1d821b88668c3ca3d18667e9a1de918560a1ff762dda3d  fb.modes"
diff --git a/device/device-amazon-thor/device-amazon-thor.post-install b/device/device-amazon-thor/device-amazon-thor.post-install
deleted file mode 100755
index ddeb08240..000000000
--- a/device/device-amazon-thor/device-amazon-thor.post-install
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-
-# Create mount point and /efs mount point in fstab
-if [ -z "$(grep /efs /etc/fstab)" ]; then
-	mkdir -p /efs
-	echo "/dev/mmcblk0p1	/efs	auto	ro	0	0" >> /etc/fstab
-fi
diff --git a/device/device-amazon-thor/fb.modes b/device/device-amazon-thor/fb.modes
index e3e5782c6..6c4fc9aaf 100755
--- a/device/device-amazon-thor/fb.modes
+++ b/device/device-amazon-thor/fb.modes
@@ -1,7 +1,7 @@
-mode "1200x1920-0"
-        # D: 1.116 MHz, H: 0.877 kHz, V: 0.448 Hz
-        geometry 1200 1920 1200 1920 16
-        timings 896149 16 32 25 10 24 2
-        accel false
-        rgba 8/24,8/16,8/8,8/0
-endmode
\ No newline at end of file
+mode "1200x1920-0"
+	# D: 1.116 MHz, H: 0.877 kHz, V: 0.448 Hz
+	geometry 1200 1920 1200 1920 24
+	timings 896149 16 32 25 10 24 2
+	accel false
+	rgba 8/16,8/8,8/0,0/0
+endmode