diff --git a/Android.bp b/Android.bp
index 803bc15..b49f0c4 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,10 +1,18 @@
 //
 // Copyright (C) 2025 The Android Open Source Project
 // Copyright (C) 2025 SebaUbuntu's TWRP device tree generator
-// Copyright (C) 2019 - Current | A-Team Digital Solutions
-//
+// SPDX-FileCopyrightText: 2025 A-Team Digital Solutions
 // SPDX-License-Identifier: Apache-2.0
-//
 
 soong_namespace {
 }
+
+prebuilt_etc {
+    name: "libboot_control_qti.so",
+    src: "proprietary/lib64/libboot_control_qti.so",
+    sub_dir: "lib64",
+    filename_from_src: true,
+    installable: false,
+    vendor: true,
+}
+
diff --git a/BoardConfig.mk b/BoardConfig.mk
index 8bfc1be..5843c42 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -37,12 +37,21 @@ TARGET_BOOTLOADER_BOARD_NAME := mona
 TARGET_NO_BOOTLOADER := true
 
 # Display
-TARGET_SCREEN_DENSITY := 450
+TARGET_SCREEN_DENSITY := 444
+TARGET_SCREEN_WIDTH := 1220
+TARGET_SCREEN_HEIGHT := 2712
 TARGET_USES_VULKAN := true
 
 # Kernel
+# Boot image format
+#BOARD_PREBUILT_DTBOIMAGE := placeholder
 BOARD_BOOTIMG_HEADER_VERSION := 4
 BOARD_MKBOOTIMG_ARGS += --header_version $(BOARD_BOOTIMG_HEADER_VERSION)
+BOARD_MKBOOTIMG_ARGS += --vendor_boot --vendor_boot_header_version 4
+BOARD_USES_RECOVERY_AS_BOOT := true
+BOARD_VENDOR_BOOTIMAGE_PARTITION_SIZE := 100663296
+BOARD_INCLUDE_RECOVERY_DTBO := true
+BOARD_INCLUDE_RECOVERY_RAMDISK := false
 BOARD_KERNEL_IMAGE_NAME := Image
 TARGET_KERNEL_CONFIG := mona_defconfig
 TARGET_KERNEL_SOURCE := kernel/motorola/mona
@@ -53,6 +62,13 @@ ifeq ($(TARGET_FORCE_PREBUILT_KERNEL),true)
 TARGET_PREBUILT_KERNEL := $(DEVICE_PATH)/prebuilt/kernel
 endif
 
+# Modules
+TARGET_RECOVERY_DEVICE_MODULES += \
+    update_engine_sideload \
+    update_verifier \
+    cppreopts.sh \
+    otapreopt_script
+
 # Partitions
 BOARD_BOOTIMAGE_PARTITION_SIZE := 134217728
 BOARD_RECOVERYIMAGE_PARTITION_SIZE := 134217728
@@ -87,7 +103,7 @@ VENDOR_SECURITY_PATCH := 2099-12-31
 PLATFORM_VERSION := 16.1.0
 
 # TWRP Configuration
-TW_THEME := portrait_hdpi
+#TW_THEME := portrait_hdpi NOW SET IN device.mk
 TW_EXTRA_LANGUAGES := true
 TW_SCREEN_BLANK_ON_BOOT := true
 TW_INPUT_BLACKLIST := "hbtp_vm"
diff --git a/README.md b/README.md
index 62d20c2..fd97796 100644
--- a/README.md
+++ b/README.md
@@ -48,7 +48,7 @@ Current state of features:
 export ALLOW_MISSING_DEPENDENCIES=true
 source build/envsetup.sh
 lunch twrp_mona-eng
-mka recoveryimage -j$(nproc --all)
+mka vendorbootimage -j$(nproc --all)
 ```
 
 **Copyright (C) 2023 Team Win Recovery Project**
diff --git a/device.mk b/device.mk
index c23190f..8210139 100644
--- a/device.mk
+++ b/device.mk
@@ -7,6 +7,13 @@
 #
 
 LOCAL_PATH := device/motorola/mona
+
+# TWRP theme fix for Soong
+PRODUCT_PROPERTY_OVERRIDES += \
+    tw_theme=portrait_hdpi
+TARGET_SCREEN_WIDTH := 1220
+TARGET_SCREEN_HEIGHT := 2712
+
 # A/B
 AB_OTA_POSTINSTALL_CONFIG += \
     RUN_POSTINSTALL_system=true \
@@ -14,20 +21,12 @@ AB_OTA_POSTINSTALL_CONFIG += \
     FILESYSTEM_TYPE_system=ext4 \
     POSTINSTALL_OPTIONAL_system=true
 
-# Boot control HAL
-PRODUCT_PACKAGES += \
-    android.hardware.boot@1.0-impl \
-    android.hardware.boot@1.0-service
-
+# Boot control HAL AIDL Adoption
+vintf_fragments += $(LOCAL_PATH)/proprietary/etc/vintf/manifest/boot-service.qti.xml
 PRODUCT_PACKAGES += \
+    bootctl \
     bootctrl.parrot
 
-PRODUCT_STATIC_BOOT_CONTROL_HAL := \
-    bootctrl.parrot \
-    libgptutils \
-    libz \
-    libcutils
-
 PRODUCT_PACKAGES += \
     otapreopt_script \
     cppreopts.sh \
diff --git a/proprietary-files.txt b/proprietary-files.txt
new file mode 100644
index 0000000..d941e10
--- /dev/null
+++ b/proprietary-files.txt
@@ -0,0 +1,6 @@
+# Copyright (C) 2019 - Current | A-Team Digital Solutions
+
+vendor/lib64/libboot_control_qti.so
+vendor/lib64/android.hardware.boot@1.1.so
+vendor/lib64/android.hardware.boot-V1-ndk.so
+
diff --git a/proprietary/etc/vintf/manifest/boot-service.qti.xml b/proprietary/etc/vintf/manifest/boot-service.qti.xml
new file mode 100644
index 0000000..18e5355
--- /dev/null
+++ b/proprietary/etc/vintf/manifest/boot-service.qti.xml
@@ -0,0 +1,10 @@
+<!--
+    Input:
+        hardware/qcom/bootctrl/aidl/boot-service.qti.xml
+-->
+<manifest version="8.0" type="device">
+    <hal format="aidl">
+        <name>android.hardware.boot</name>
+        <fqname>IBootControl/default</fqname>
+    </hal>
+</manifest>
diff --git a/proprietary/lib64/libboot_control_qti.so b/proprietary/lib64/libboot_control_qti.so
new file mode 100644
index 0000000..5cca1c7
Binary files /dev/null and b/proprietary/lib64/libboot_control_qti.so differ