diff --git a/BoardConfig.mk b/BoardConfig.mk
index f13a7af..894aa5e 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -17,7 +17,7 @@ SOONG_CONFIG_qtidisplay_udfps := true
 
 # Kernel
 BOARD_KERNEL_CMDLINE += androidboot.hab.product=bangkk
-TARGET_KERNEL_CONFIG += vendor/lineage_bangkk.config
+TARGET_KERNEL_CONFIG += vendor/ext_config/moto-holi-bangkk.config
 
 # Kernel Modules
 BOARD_VENDOR_KERNEL_MODULES_LOAD := $(strip $(shell cat $(DEVICE_PATH)/modules.load))
diff --git a/modules.blocklist b/modules.blocklist
index b5e1237..dd62766 100644
--- a/modules.blocklist
+++ b/modules.blocklist
@@ -84,8 +84,6 @@ blocklist vmw_vsock_virtio_transport
 blocklist vmw_vsock_virtio_transport_common
 blocklist vsock_diag
 blocklist vsock
-blocklist qca_cld3_wlan
-blocklist qca_cld3_qca6390
 blocklist torture
 blocklist locktorture
 blocklist rcutorture
@@ -93,11 +91,20 @@ blocklist rcutorture
 #
 # Motorola platform module block list
 #
-
 blocklist utags
+blocklist watchdogtest
+blocklist moto_f_usbnet
 # Copyright (c) 2019-2020, The Linux Foundation. All rights reserved.
 #
 # Motorola product module block list
 #
 
-
+blocklist fpsensor_spi_tee
+blocklist fpc1020_mmi
+blocklist qpnp_adaptive_charge
+blocklist nova_0flash_mmi
+blocklist leds_aw99703
+blocklist leds_lm3697
+blocklist focaltech_0flash_v2_mmi
+blocklist mmi_smbcharger_iio
+blocklist mmi_parallel_charger_iio
diff --git a/modules.load b/modules.load
index cfb5e4c..0f7ba72 100644
--- a/modules.load
+++ b/modules.load
@@ -1,110 +1,69 @@
-stub_dlkm.ko
 machine_dlkm.ko
-fc2580.ko
-mt2063.ko
-tda9887.ko
-apr_dlkm.ko
-mxl5005s.ko
-xc4000.ko
-tuner-xc2028.ko
-radio-i2c-rtc6226-qca.ko
-max2165.ko
-qt1010.ko
-slimbus-ngd.ko
-llcc_perfmon.ko
-platform_dlkm.ko
-wsa883x_dlkm.ko
-tea5767.ko
-msi001.ko
-qm1d1c0042.ko
-fc0013.ko
-btpower.ko
-tua9001.ko
-m88rs6000t.ko
-qcom_edac.ko
-fc0011.ko
-wcd937x_dlkm.ko
-pinctrl_lpi_dlkm.ko
-fc0012.ko
-aw882xx_k504.ko
-mt20xx.ko
-xc5000.ko
-wcd9xxx_dlkm.ko
-bt_fm_slim.ko
-tea5761.ko
-rx_macro_dlkm.ko
-pinctrl_wcd_dlkm.ko
-wsa_macro_dlkm.ko
-adsp_loader_dlkm.ko
-wcd938x_dlkm.ko
-q6_dlkm.ko
-hdmi_dlkm.ko
-swr_haptics_dlkm.ko
-tda18218.ko
-msm_drm.ko
-tda18212.ko
-wcd937x_slave_dlkm.ko
-mt2060.ko
-q6_notifier_dlkm.ko
-tuner-simple.ko
-snd_event_dlkm.ko
-mc44s803.ko
-wcd_core_dlkm.ko
-qm1d1b0004.ko
-tda18250.ko
-mbhc_dlkm.ko
-tuner-types.ko
-si2157.ko
-mt2131.ko
-slimbus.ko
-native_dlkm.ko
-va_macro_dlkm.ko
-hid-aksys.ko
-mt2266.ko
-bolero_cdc_dlkm.ko
-mxl5007t.ko
-wcd938x_slave_dlkm.ko
-q6_pdr_dlkm.ko
-e4000.ko
-it913x.ko
-swr_ctrl_dlkm.ko
-mxl301rf.ko
-swr_dlkm.ko
+lzo-rle.ko
+aw87xxx_dlkm.ko
 rdbg.ko
-swr_dmic_dlkm.ko
-r820t.ko
+va_macro_dlkm.ko
+wcd937x_slave_dlkm.ko
+wcd_core_dlkm.ko
+wcd9xxx_dlkm.ko
+rx_macro_dlkm.ko
+q6_notifier_dlkm.ko
 camera.ko
+lzo_decompress.ko
+btpower.ko
+wsa881x_analog_dlkm.ko
+aw882xx_k419.ko
+adsp_loader_dlkm.ko
+sec_nfc.ko
+native_dlkm.ko
+q6_pdr_dlkm.ko
+bt_fm_slim.ko
+wcd938x_dlkm.ko
+swr_dlkm.ko
+platform_dlkm.ko
+lzo_compress.ko
+lzo.ko
 tx_macro_dlkm.ko
+snd_event_dlkm.ko
+mbhc_dlkm.ko
+swr_ctrl_dlkm.ko
+stub_dlkm.ko
+bolero_cdc_dlkm.ko
+pinctrl_lpi_dlkm.ko
+wcd938x_slave_dlkm.ko
+apr_dlkm.ko
+zram.ko
+wcd937x_dlkm.ko
+q6_dlkm.ko
+aw882xx_acf.ko
 wlan.ko
 rmnet_core.ko
 rmnet_ctl.ko
 rmnet_offload.ko
 rmnet_shs.ko
 utags.ko
+mmi_relay.ko
 mmi_info.ko
 mmi_annotate.ko
 sensors_class.ko
-watchdogtest.ko
 exfat.ko
-bm_adsp_ulog.ko
-mmi_charger.ko
-qti_glink_charger.ko
-qpnp_adaptive_charge.ko
-cirrus_wm_adsp.ko
-cirrus_cs35l41.ko
-cirrus_cs35l45.ko
-aw862x.ko
-mmi_info.ko
-mmi_relay.ko
-wl2864c.ko
-cci_intf.ko
-st21nfc.ko
-nfc_i2c.ko
-sx937x_sar.ko
 moto_f_usbnet.ko
-touchscreen_mmi.ko
-goodix_brl_mmi.ko
+watchdogtest.ko
+qpnp_adaptive_charge.ko
+rbs_fod_mmi.ko
+sensors_class.ko
+mmi_relay.ko
+sx937x_sar.ko
+awinic_sar.ko
 mmi_sys_temp.ko
-rbs_fps_mmi.ko
-mmi_info.ko
-mmi_annotate.ko
+ldo_vibrator_mmi.ko
+touchscreen_mmi.ko
+focaltech_v3.ko
+goodix_brl_mmi.ko
+cci_intf.ko
+bq25980_mmi_iio.ko
+mmi-smbcharger-iio.ko
+mmi_parallel_charger_iio.ko
+fm_ctrl.ko
+moto_mm.ko
+moto_swap.ko
diff --git a/modules.load.recovery b/modules.load.recovery
index 399dce7..c14c5e2 100644
--- a/modules.load.recovery
+++ b/modules.load.recovery
@@ -1,7 +1,9 @@
-msm_drm.ko
+focaltech_v3.ko
+goodix_brl_mmi.ko
 mmi_relay.ko
-sensors_class.ko
-touchscreen_mmi.ko
 mmi_annotate.ko
 mmi_info.ko
-goodix_brl_mmi.ko
+mmi_parallel_charger_iio.ko
+mmi-smbcharger-iio.ko
+touchscreen_mmi.ko
+sensors_class.ko