diff --git a/CODEOWNERS b/CODEOWNERS
index 25429fead..c2e5a28eb 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -31,6 +31,7 @@ device/*/*-pine64-pinephonepro/			@PsychoGame
 device/*/*-pine64-rockpro64/			@PureTryOut
 device/*/*-purism-librem5/			@craftyguy @alistair23 @Newbyte
 device/*/*-qcom-msm8916/			@Minecrell @TravMurav
+device/*/*-qcom-msm8953/			@barni2000 @alikates @vipaoL @jiaxyga
 device/*/*-qcom-sdm670/				@flamingradian
 device/*/*-qcom-sdm845/				@sdm845-mainline
 device/*/*-qcom-sm6350/				@z3ntu
diff --git a/device/community/device-xiaomi-daisy/90-device-xiaomi-daisy.rules b/device/archived/device-xiaomi-daisy/90-device-xiaomi-daisy.rules
similarity index 100%
rename from device/community/device-xiaomi-daisy/90-device-xiaomi-daisy.rules
rename to device/archived/device-xiaomi-daisy/90-device-xiaomi-daisy.rules
diff --git a/device/community/device-xiaomi-daisy/APKBUILD b/device/archived/device-xiaomi-daisy/APKBUILD
similarity index 100%
rename from device/community/device-xiaomi-daisy/APKBUILD
rename to device/archived/device-xiaomi-daisy/APKBUILD
diff --git a/device/community/device-xiaomi-daisy/deviceinfo b/device/archived/device-xiaomi-daisy/deviceinfo
similarity index 100%
rename from device/community/device-xiaomi-daisy/deviceinfo
rename to device/archived/device-xiaomi-daisy/deviceinfo
diff --git a/device/community/device-xiaomi-daisy/modules-initfs b/device/archived/device-xiaomi-daisy/modules-initfs
similarity index 100%
rename from device/community/device-xiaomi-daisy/modules-initfs
rename to device/archived/device-xiaomi-daisy/modules-initfs
diff --git a/device/community/device-xiaomi-markw/APKBUILD b/device/archived/device-xiaomi-markw/APKBUILD
similarity index 100%
rename from device/community/device-xiaomi-markw/APKBUILD
rename to device/archived/device-xiaomi-markw/APKBUILD
diff --git a/device/community/device-xiaomi-markw/deviceinfo b/device/archived/device-xiaomi-markw/deviceinfo
similarity index 100%
rename from device/community/device-xiaomi-markw/deviceinfo
rename to device/archived/device-xiaomi-markw/deviceinfo
diff --git a/device/community/device-xiaomi-markw/modules-initfs b/device/archived/device-xiaomi-markw/modules-initfs
similarity index 100%
rename from device/community/device-xiaomi-markw/modules-initfs
rename to device/archived/device-xiaomi-markw/modules-initfs
diff --git a/device/community/device-xiaomi-mido/APKBUILD b/device/archived/device-xiaomi-mido/APKBUILD
similarity index 100%
rename from device/community/device-xiaomi-mido/APKBUILD
rename to device/archived/device-xiaomi-mido/APKBUILD
diff --git a/device/community/device-xiaomi-mido/deviceinfo b/device/archived/device-xiaomi-mido/deviceinfo
similarity index 100%
rename from device/community/device-xiaomi-mido/deviceinfo
rename to device/archived/device-xiaomi-mido/deviceinfo
diff --git a/device/community/device-xiaomi-mido/modules-initfs b/device/archived/device-xiaomi-mido/modules-initfs
similarity index 100%
rename from device/community/device-xiaomi-mido/modules-initfs
rename to device/archived/device-xiaomi-mido/modules-initfs
diff --git a/device/testing/device-xiaomi-onclite/APKBUILD b/device/archived/device-xiaomi-onclite/APKBUILD
similarity index 100%
rename from device/testing/device-xiaomi-onclite/APKBUILD
rename to device/archived/device-xiaomi-onclite/APKBUILD
diff --git a/device/testing/device-xiaomi-onclite/deviceinfo b/device/archived/device-xiaomi-onclite/deviceinfo
similarity index 100%
rename from device/testing/device-xiaomi-onclite/deviceinfo
rename to device/archived/device-xiaomi-onclite/deviceinfo
diff --git a/device/testing/device-xiaomi-onclite/modules-initfs b/device/archived/device-xiaomi-onclite/modules-initfs
similarity index 100%
rename from device/testing/device-xiaomi-onclite/modules-initfs
rename to device/archived/device-xiaomi-onclite/modules-initfs
diff --git a/device/testing/device-xiaomi-rosy/APKBUILD b/device/archived/device-xiaomi-rosy/APKBUILD
similarity index 100%
rename from device/testing/device-xiaomi-rosy/APKBUILD
rename to device/archived/device-xiaomi-rosy/APKBUILD
diff --git a/device/testing/device-xiaomi-rosy/deviceinfo b/device/archived/device-xiaomi-rosy/deviceinfo
similarity index 100%
rename from device/testing/device-xiaomi-rosy/deviceinfo
rename to device/archived/device-xiaomi-rosy/deviceinfo
diff --git a/device/testing/device-xiaomi-rosy/modules-initfs b/device/archived/device-xiaomi-rosy/modules-initfs
similarity index 100%
rename from device/testing/device-xiaomi-rosy/modules-initfs
rename to device/archived/device-xiaomi-rosy/modules-initfs
diff --git a/device/community/device-xiaomi-tissot/APKBUILD b/device/archived/device-xiaomi-tissot/APKBUILD
similarity index 100%
rename from device/community/device-xiaomi-tissot/APKBUILD
rename to device/archived/device-xiaomi-tissot/APKBUILD
diff --git a/device/community/device-xiaomi-tissot/deviceinfo b/device/archived/device-xiaomi-tissot/deviceinfo
similarity index 100%
rename from device/community/device-xiaomi-tissot/deviceinfo
rename to device/archived/device-xiaomi-tissot/deviceinfo
diff --git a/device/community/device-xiaomi-tissot/modules-initfs b/device/archived/device-xiaomi-tissot/modules-initfs
similarity index 100%
rename from device/community/device-xiaomi-tissot/modules-initfs
rename to device/archived/device-xiaomi-tissot/modules-initfs
diff --git a/device/community/device-xiaomi-vince/APKBUILD b/device/archived/device-xiaomi-vince/APKBUILD
similarity index 100%
rename from device/community/device-xiaomi-vince/APKBUILD
rename to device/archived/device-xiaomi-vince/APKBUILD
diff --git a/device/community/device-xiaomi-vince/deviceinfo b/device/archived/device-xiaomi-vince/deviceinfo
similarity index 100%
rename from device/community/device-xiaomi-vince/deviceinfo
rename to device/archived/device-xiaomi-vince/deviceinfo
diff --git a/device/community/device-xiaomi-vince/modules-initfs b/device/archived/device-xiaomi-vince/modules-initfs
similarity index 100%
rename from device/community/device-xiaomi-vince/modules-initfs
rename to device/archived/device-xiaomi-vince/modules-initfs
diff --git a/device/community/device-xiaomi-ysl/APKBUILD b/device/archived/device-xiaomi-ysl/APKBUILD
similarity index 100%
rename from device/community/device-xiaomi-ysl/APKBUILD
rename to device/archived/device-xiaomi-ysl/APKBUILD
diff --git a/device/community/device-xiaomi-ysl/deviceinfo b/device/archived/device-xiaomi-ysl/deviceinfo
similarity index 100%
rename from device/community/device-xiaomi-ysl/deviceinfo
rename to device/archived/device-xiaomi-ysl/deviceinfo
diff --git a/device/community/device-xiaomi-ysl/modules-initfs b/device/archived/device-xiaomi-ysl/modules-initfs
similarity index 100%
rename from device/community/device-xiaomi-ysl/modules-initfs
rename to device/archived/device-xiaomi-ysl/modules-initfs
diff --git a/device/community/firmware-xiaomi-daisy/APKBUILD b/device/archived/firmware-xiaomi-daisy/APKBUILD
similarity index 100%
rename from device/community/firmware-xiaomi-daisy/APKBUILD
rename to device/archived/firmware-xiaomi-daisy/APKBUILD
diff --git a/device/community/firmware-xiaomi-markw/APKBUILD b/device/archived/firmware-xiaomi-markw/APKBUILD
similarity index 100%
rename from device/community/firmware-xiaomi-markw/APKBUILD
rename to device/archived/firmware-xiaomi-markw/APKBUILD
diff --git a/device/community/firmware-xiaomi-mido/APKBUILD b/device/archived/firmware-xiaomi-mido/APKBUILD
similarity index 100%
rename from device/community/firmware-xiaomi-mido/APKBUILD
rename to device/archived/firmware-xiaomi-mido/APKBUILD
diff --git a/device/testing/firmware-xiaomi-onclite/APKBUILD b/device/archived/firmware-xiaomi-onclite/APKBUILD
similarity index 100%
rename from device/testing/firmware-xiaomi-onclite/APKBUILD
rename to device/archived/firmware-xiaomi-onclite/APKBUILD
diff --git a/device/testing/firmware-xiaomi-rosy/APKBUILD b/device/archived/firmware-xiaomi-rosy/APKBUILD
similarity index 100%
rename from device/testing/firmware-xiaomi-rosy/APKBUILD
rename to device/archived/firmware-xiaomi-rosy/APKBUILD
diff --git a/device/community/firmware-xiaomi-tissot/APKBUILD b/device/archived/firmware-xiaomi-tissot/APKBUILD
similarity index 100%
rename from device/community/firmware-xiaomi-tissot/APKBUILD
rename to device/archived/firmware-xiaomi-tissot/APKBUILD
diff --git a/device/community/firmware-xiaomi-vince/APKBUILD b/device/archived/firmware-xiaomi-vince/APKBUILD
similarity index 100%
rename from device/community/firmware-xiaomi-vince/APKBUILD
rename to device/archived/firmware-xiaomi-vince/APKBUILD
diff --git a/device/community/firmware-xiaomi-ysl/APKBUILD b/device/archived/firmware-xiaomi-ysl/APKBUILD
similarity index 100%
rename from device/community/firmware-xiaomi-ysl/APKBUILD
rename to device/archived/firmware-xiaomi-ysl/APKBUILD
diff --git a/device/community/device-qcom-msm8953/90-device-xiaomi-daisy.rules b/device/community/device-qcom-msm8953/90-device-xiaomi-daisy.rules
new file mode 100644
index 000000000..561e5ba37
--- /dev/null
+++ b/device/community/device-qcom-msm8953/90-device-xiaomi-daisy.rules
@@ -0,0 +1,5 @@
+SUBSYSTEM=="input", ENV{DEVNAME}=="/dev/input/event1", \
+ATTRS{name}=="Goodix Capacitive TouchScreen", \
+ENV{WL_CALIBRATION}="4.00 0.00 0.00 0.00 1.80 0.00", \
+ENV{LIBINPUT_CALIBRATION_MATRIX}="4.00 0.00 0 0.00 1.80 0", \
+ENV{ID_INPUT}="1", ENV{ID_INPUT_TOUCHSCREEN}="1"
diff --git a/device/testing/device-qcom-msm8953/APKBUILD b/device/community/device-qcom-msm8953/APKBUILD
similarity index 61%
rename from device/testing/device-qcom-msm8953/APKBUILD
rename to device/community/device-qcom-msm8953/APKBUILD
index aa8a4aced..fe3765d81 100644
--- a/device/testing/device-qcom-msm8953/APKBUILD
+++ b/device/community/device-qcom-msm8953/APKBUILD
@@ -1,9 +1,12 @@
-# Maintainer: Barnabas Czeman <trabarni@gmail.com>
 # Reference: <https://postmarketos.org/devicepkg>
+# Maintainer: Barnabas Czeman <trabarni@gmail.com>
+# Co-Maintainer: Alejandro Tafalla <alikates@dnyon.com>
+# Co-Maintainer: Victor Pavlov (vipaoL) <vipaolmail@gmail.com>
+# Co-Maintainer: Danila Tikhonov (JIaxyga) <danila@mainlining.org>
 
 pkgname=device-qcom-msm8953
 pkgdesc="Generic device package for various Qualcomm MSM8953/SDM450/SDM632-based devices"
-pkgver=4
+pkgver=5
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -22,9 +25,11 @@ depends="
 	soc-qcom-msm8953-modem
 "
 makedepends="devicepkg-dev"
+subpackages="device-xiaomi-daisy-fake-goodix:xiaomi_daisy_fake_goodix"
 source="
 	deviceinfo
 	modules-initfs
+	90-device-xiaomi-daisy.rules
 "
 
 build() {
@@ -35,7 +40,13 @@ package() {
 	devicepkg_package $startdir $pkgname
 }
 
+xiaomi_daisy_fake_goodix() {
+	pkgdesc="Calibration data for replacement goodix touch controllers"
+	install -Dm644 90-device-xiaomi-daisy.rules -t "$subpkgdir/etc/udev/rules.d/"
+}
+
 sha512sums="
 7a0f4358d041c9bdb24c1018d13d390b111d823316d7d4b94f7c41aada97d9d94162ef7610226332ec3122e04108d7e08f8a844769b262caefbe97e92df1b39d  deviceinfo
 70917147c1c49f9419ff8be2a03e38c24ad7730091c53a2182797dde85fd8c2073f71187e8e583774974a1509b634433725543547e528364f41d85e63b2ace85  modules-initfs
+a2608b01b7b6e2dade694af355ff4f0f26cad49cf54bc332c77eb75d19fdc985f7f996fedb72753de447be0391deabf5fcea52406791d1e6e0d165703b63f145  90-device-xiaomi-daisy.rules
 "
diff --git a/device/testing/device-qcom-msm8953/deviceinfo b/device/community/device-qcom-msm8953/deviceinfo
similarity index 100%
rename from device/testing/device-qcom-msm8953/deviceinfo
rename to device/community/device-qcom-msm8953/deviceinfo
diff --git a/device/testing/device-qcom-msm8953/modules-initfs b/device/community/device-qcom-msm8953/modules-initfs
similarity index 100%
rename from device/testing/device-qcom-msm8953/modules-initfs
rename to device/community/device-qcom-msm8953/modules-initfs
diff --git a/device/testing/firmware-qcom-msm8953/APKBUILD b/device/community/firmware-qcom-msm8953/APKBUILD
similarity index 100%
rename from device/testing/firmware-qcom-msm8953/APKBUILD
rename to device/community/firmware-qcom-msm8953/APKBUILD