diff --git a/catch-kernel-trouble.sh b/catch-kernel-trouble.sh
index ca1a0c6..a6d2bc9 100755
--- a/catch-kernel-trouble.sh
+++ b/catch-kernel-trouble.sh
@@ -27,6 +27,6 @@ echo
 cat kernel-trouble.txt
 
 echo
-echo "Saved to \"$PWD/kernel-trouble\""
-echo "Full log was saved to \"/tmp/full-kernel-trouble\""
+echo "Saved to \"$PWD/kernel-trouble.txt\""
+echo "Full log was saved to \"/tmp/full-kernel-trouble.txt\""
 echo
diff --git a/device-xiaomi-angelican/APKBUILD b/device-xiaomi-angelican/APKBUILD
index 1c38835..0c90e47 100644
--- a/device-xiaomi-angelican/APKBUILD
+++ b/device-xiaomi-angelican/APKBUILD
@@ -33,7 +33,7 @@ package() {
 }
 
 sha512sums="
-48f02a53d7957efbce6176456299f9bb8890da5d3c5f679d83b267426e93e06ea7534aa527249cbf3add7e783c090259195f8720216eb7192e70087cc3bfd5ae  deviceinfo
+dcf8b98925b61178d2ff11e199f4701f1f153821bb5670d18be60ce338459c53647a8ccdfb99b86ecb0e92a59ccbc310a22e1b343254d1645499ea09652bfe03  deviceinfo
 87a1e3b1f31a7a2717992621eaad272d8ad7e2dca7346e7fcd583e70eb73d817bcfc32b51c322e19ccf575fa0ef3ea7f6279e3176abc4db0c5d49336b9971d05  BT_FW.cfg
 3f973f1ae3f24dd9aa087976cc5965aad41c4a0065f69b3e20c1ebe44e34ee2821312f9610b0c8db6b7b6782cb196afca557f86819514e3873d0be468c588ef4  Himax_firmware.bin
 43bea79d5af5ada68eb96b5947c88f385f15d7691c6868bf54dcc31ca7175b037422d7e19065b2e24a511de6d60082b11676b7e8e0b3dccbc66a09c1d64e1f1d  Himax_mpfw.bin
diff --git a/device-xiaomi-angelican/deviceinfo b/device-xiaomi-angelican/deviceinfo
index d69a420..e8ac961 100644
--- a/device-xiaomi-angelican/deviceinfo
+++ b/device-xiaomi-angelican/deviceinfo
@@ -20,15 +20,19 @@ deviceinfo_screen_width="720"
 deviceinfo_screen_height="1600"
 
 # Bootloader related
+# deviceinfo_kernel_cmdline="bootopt=64S3,32N2,64N2 androidboot.init_fatal_reboot_target=recovery buildvariant=userdebug kpti=off"
+deviceinfo_kernel_cmdline="bootopt=64S3,32N2,64N2 buildvariant=user"
 deviceinfo_create_initfs_extra="true"
 deviceinfo_flash_method="fastboot"
-deviceinfo_kernel_cmdline="bootopt=64S3,32N2,64N2 androidboot.init_fatal_reboot_target=recovery buildvariant=userdebug kpti=off"
-deviceinfo_generate_bootimg="true"
-deviceinfo_bootimg_qcdt="false"
+deviceinfo_flash_sparse="true"
 deviceinfo_bootimg_mtk_mkimage="false"
+deviceinfo_bootimg_qcdt="false"
 deviceinfo_bootimg_dtb_second="false"
+
+# Flashing related
+deviceinfo_generate_bootimg="true"
 deviceinfo_flash_pagesize="2048"
-deviceinfo_header_version="3"
+deviceinfo_header_version="2"
 deviceinfo_append_dtb="false"
 deviceinfo_flash_offset_dtb="0x07808000"
 deviceinfo_flash_offset_base="0x40078000"
@@ -36,5 +40,4 @@ deviceinfo_flash_offset_kernel="0x00008000"
 deviceinfo_flash_offset_ramdisk="0x11a88000"
 deviceinfo_flash_offset_second="0xbff88000"
 deviceinfo_flash_offset_tags="0x07808000"
-deviceinfo_flash_sparse="true"
 
diff --git a/linux-xiaomi-angelican/APKBUILD b/linux-xiaomi-angelican/APKBUILD
index a0bcf62..21297c5 100644
--- a/linux-xiaomi-angelican/APKBUILD
+++ b/linux-xiaomi-angelican/APKBUILD
@@ -64,7 +64,7 @@ package() {
 
 sha512sums="
 beeaa1b5b5d3e6f635508c6f421051080f7fdc296909db7448e4c706b6a54755badc2ea0c1316dbf0a1d394dbea15266a84dfa36d9818c8df99747484c9175b6  linux-xiaomi-angelican-5b52fedbe4d7c6809b5040f7486a8b72812f3fba.tar.gz
-27dd6f087358de4597005b97eef6c8dafcded0a2f6f6700c78d63d961ea9f16255e0ee8881d6d8ca9a618e9c1ca0088320775beb23a4aad95a54d269673a514e  config-xiaomi-angelican.aarch64
+c9d2007d2e6d64c9d0a36fbc8078fb295ce1a23b6daf32571f47d0b9079486ace775f23c51e683a091ba405ee251e98d132b6de3c3fd56a29713b14cac23aca8  config-xiaomi-angelican.aarch64
 3fc36011ab030382f6b74e3821dcc75a236e12fe38bf18639fededc6c49a8c809d9ca1af5a9f2ed83f5f412a383918db14b4af48eda7087ec5997ca00e018152  001-touchscreen-firmware-loading-time.patch
 2ed25978e3c91addf7e568b68ccb6036aa581da0981ec75527e25d15d0ee7dfed97100376e58ce6a6c07ef8a96210a30c0ad91b3cea29528aa89fc59980691bf  002-battery-percentage.patch
 c33fad9de627e72f12e61e728fa1ec53ef15259c7790392a997cc7269e60e45da9534d58851c3b348a1729aaa134d1df305e33546e8a1f3654462f2c3c1d9563  003-fix-check-lxdialog-makefile.patch
diff --git a/linux-xiaomi-angelican/config-xiaomi-angelican.aarch64 b/linux-xiaomi-angelican/config-xiaomi-angelican.aarch64
index 7f72e35..84a9afb 100644
--- a/linux-xiaomi-angelican/config-xiaomi-angelican.aarch64
+++ b/linux-xiaomi-angelican/config-xiaomi-angelican.aarch64
@@ -51,6 +51,7 @@ CONFIG_LOCALVERSION_AUTO=y
 CONFIG_DEFAULT_HOSTNAME="(none)"
 CONFIG_SWAP=y
 CONFIG_SYSVIPC=y
+CONFIG_SYSVIPC_SYSCTL=y
 # CONFIG_POSIX_MQUEUE is not set
 CONFIG_CROSS_MEMORY_ATTACH=y
 # CONFIG_FHANDLE is not set
@@ -516,6 +517,7 @@ CONFIG_BINFMT_SCRIPT=y
 # CONFIG_BINFMT_MISC is not set
 CONFIG_COREDUMP=y
 CONFIG_COMPAT=y
+CONFIG_SYSVIPC_COMPAT=y
 CONFIG_KEYS_COMPAT=y
 
 #
@@ -703,7 +705,7 @@ CONFIG_IPV6_MROUTE=y
 # CONFIG_IPV6_MROUTE_MULTIPLE_TABLES is not set
 CONFIG_IPV6_PIMSM_V2=y
 # CONFIG_NETLABEL is not set
-CONFIG_ANDROID_PARANOID_NETWORK=n
+# CONFIG_ANDROID_PARANOID_NETWORK is not set
 CONFIG_NETWORK_SECMARK=y
 # CONFIG_NET_PTP_CLASSIFY is not set
 # CONFIG_NETWORK_PHY_TIMESTAMPING is not set
@@ -1112,6 +1114,7 @@ CONFIG_ARM_AMBA=y
 CONFIG_UEVENT_HELPER=y
 CONFIG_UEVENT_HELPER_PATH=""
 CONFIG_DEVTMPFS=y
+# CONFIG_DEVTMPFS_MOUNT is not set
 CONFIG_STANDALONE=y
 CONFIG_PREVENT_FIRMWARE_BUILD=y
 CONFIG_FW_LOADER=y
@@ -2208,7 +2211,11 @@ CONFIG_GOODIX_SENSOR_TYPE="GF5216"
 #
 CONFIG_TTY=y
 CONFIG_VT=y
-CONFIG_USER_NS=y
+CONFIG_CONSOLE_TRANSLATIONS=y
+CONFIG_VT_CONSOLE=y
+CONFIG_VT_CONSOLE_SLEEP=y
+CONFIG_HW_CONSOLE=y
+# CONFIG_VT_HW_CONSOLE_BINDING is not set
 CONFIG_UNIX98_PTYS=y
 CONFIG_LEGACY_PTYS=y
 CONFIG_LEGACY_PTY_COUNT=16
@@ -2790,6 +2797,14 @@ CONFIG_FB_TILEBLITTING=y
 # CONFIG_BACKLIGHT_LCD_SUPPORT is not set
 # CONFIG_VGASTATE is not set
 CONFIG_HDMI=y
+
+#
+# Console display driver support
+#
+CONFIG_DUMMY_CONSOLE=y
+CONFIG_DUMMY_CONSOLE_COLUMNS=80
+CONFIG_DUMMY_CONSOLE_ROWS=25
+# CONFIG_FRAMEBUFFER_CONSOLE is not set
 CONFIG_LOGO=y
 CONFIG_LOGO_LINUX_MONO=y
 CONFIG_LOGO_LINUX_VGA16=y
@@ -3593,6 +3608,7 @@ CONFIG_STAGING=y
 #
 # Speakup console speech
 #
+# CONFIG_SPEAKUP is not set
 # CONFIG_STAGING_MEDIA is not set
 
 #
@@ -4066,7 +4082,7 @@ CONFIG_ANDROID_BINDER_DEVICES="binder,hwbinder,vndbinder"
 #
 CONFIG_ARM_PSCI_FW=y
 # CONFIG_ARM_SCPI_PROTOCOL is not set
-# CONFIG_FIRMWARE_MEMMAP is not set
+CONFIG_FIRMWARE_MEMMAP=y
 CONFIG_HAVE_ARM_SMCCC=y
 # CONFIG_MESON_SM is not set
 
@@ -4078,11 +4094,11 @@ CONFIG_DCACHE_WORD_ACCESS=y
 # CONFIG_EXT3_FS is not set
 CONFIG_EXT4_FS=y
 CONFIG_EXT4_USE_FOR_EXT2=y
-# CONFIG_EXT4_FS_POSIX_ACL is not set
+CONFIG_EXT4_FS_POSIX_ACL=y
 CONFIG_EXT4_FS_SECURITY=y
 CONFIG_EXT4_ENCRYPTION=y
 CONFIG_EXT4_FS_ENCRYPTION=y
-# CONFIG_EXT4_DEBUG is not set
+CONFIG_EXT4_DEBUG=y
 CONFIG_JBD2=y
 # CONFIG_JBD2_DEBUG is not set
 CONFIG_FS_MBCACHE=y
@@ -4168,7 +4184,7 @@ CONFIG_KERNFS=y
 CONFIG_SYSFS=y
 CONFIG_TMPFS=y
 CONFIG_TMPFS_POSIX_ACL=y
-# CONFIG_TMPFS_XATTR is not set
+CONFIG_TMPFS_XATTR=y
 # CONFIG_HUGETLBFS is not set
 # CONFIG_HUGETLB_PAGE is not set
 CONFIG_ARCH_HAS_GIGANTIC_PAGE=y