diff --git a/modules.blocklist b/modules.blocklist
index a23784e..9e5e2ac 100644
--- a/modules.blocklist
+++ b/modules.blocklist
@@ -98,9 +98,19 @@ blocklist utags
 #
 
 blocklist fpsensor_spi_tee
+blocklist rbs_fps_mmi
+blocklist focal_fps_mmi
 blocklist fpc1020_mmi
 blocklist qpnp_adaptive_charge
-blocklist nova_0flash_mmi
-blocklist focaltech_0flash_v2_mmi
-blocklist mmi_smbcharger_iio
-blocklist mmi_parallel_charger_iio
+blocklist goodix_brl_mmi
+blocklist tcpc_class
+blocklist tcpc_rt1711h
+blocklist tcpc_sgm7220.ko
+blocklist rt_pd_manager
+blocklist mmi_charger
+blocklist mmi_discrete_charger_class
+blocklist mmi_discrete_charger
+blocklist sgm4154x_charger
+blocklist bq2589x_charger
+blocklist bq2597x_mmi_iio
+blocklist mmi_discrete_turbo_charger
diff --git a/modules.load b/modules.load
index 12b57b4..add9821 100644
--- a/modules.load
+++ b/modules.load
@@ -1,41 +1,34 @@
-wcd9xxx_dlkm.ko
-aw882xx_acf.ko
-wsa881x_analog_dlkm.ko
-btpower.ko
-q6_pdr_dlkm.ko
-machine_dlkm.ko
-zram.ko
 swr_ctrl_dlkm.ko
-wcd938x_slave_dlkm.ko
-q6_notifier_dlkm.ko
-wcd_core_dlkm.ko
-wcd937x_slave_dlkm.ko
-wcd937x_dlkm.ko
-rx_macro_dlkm.ko
+va_macro_dlkm.ko
+btpower.ko
 platform_dlkm.ko
-lzo_decompress.ko
-camera.ko
-sec_nfc.ko
 pinctrl_lpi_dlkm.ko
 wcd938x_dlkm.ko
-stub_dlkm.ko
-bt_fm_slim.ko
-aw87xxx_dlkm.ko
-adsp_loader_dlkm.ko
-mbhc_dlkm.ko
-va_macro_dlkm.ko
-native_dlkm.ko
-snd_event_dlkm.ko
-rdbg.ko
-lzo-rle.ko
 bolero_cdc_dlkm.ko
+wcd937x_dlkm.ko
+snd_event_dlkm.ko
+stub_dlkm.ko
+wcd_core_dlkm.ko
 q6_dlkm.ko
-lzo.ko
-aw882xx_k419.ko
-lzo_compress.ko
-apr_dlkm.ko
-swr_dlkm.ko
+q6_pdr_dlkm.ko
 tx_macro_dlkm.ko
+native_dlkm.ko
+aw882xx_k419.ko
+rx_macro_dlkm.ko
+wsa881x_analog_dlkm.ko
+aw882xx_acf.ko
+wcd937x_slave_dlkm.ko
+bt_fm_slim.ko
+rdbg.ko
+wcd9xxx_dlkm.ko
+wcd938x_slave_dlkm.ko
+camera.ko
+machine_dlkm.ko
+mbhc_dlkm.ko
+q6_notifier_dlkm.ko
+adsp_loader_dlkm.ko
+swr_dlkm.ko
+apr_dlkm.ko
 wlan.ko
 rmnet_core.ko
 rmnet_ctl.ko
@@ -48,16 +41,27 @@ mmi_annotate.ko
 sensors_class.ko
 exfat.ko
 qpnp_adaptive_charge.ko
-rbs_fod_mmi.ko
-sx937x_sar.ko
-awinic_sar.ko
-mmi_sys_temp.ko
+rbs_fps_mmi.ko
+focal_fps_mmi.ko
 ldo_vibrator_mmi.ko
-touchscreen_mmi.ko
-focaltech_v3.ko
-goodix_brl_mmi.ko
+wl2868c.ko
 cci_intf.ko
-bq25980_mmi_iio.ko
-mmi-smbcharger-iio.ko
-mmi_parallel_charger_iio.ko
-fm_ctrl.ko
+mmi_relay.ko
+touchscreen_mmi.ko
+goodix_brl_mmi.ko
+sec_nfc.ko
+sx937x_sar.ko
+mmi_sys_temp.ko
+cw2217b_fg_mmi.ko
+sm5602_fg_mmi.ko
+tcpc_class.ko
+tcpc_sgm7220.ko
+adapter_class.ko
+rt_pd_manager.ko
+sgm4154x_charger.ko
+bq2589x_charger.ko
+bq2597x_mmi_iio.ko
+mmi_charger.ko
+mmi_discrete_charger_class.ko
+mmi_discrete_charger.ko
+mmi_discrete_turbo_charger.ko
diff --git a/modules.load.recovery b/modules.load.recovery
index c14c5e2..c710ba5 100644
--- a/modules.load.recovery
+++ b/modules.load.recovery
@@ -1,9 +1,22 @@
-focaltech_v3.ko
-goodix_brl_mmi.ko
+utags.ko
 mmi_relay.ko
-mmi_annotate.ko
 mmi_info.ko
-mmi_parallel_charger_iio.ko
-mmi-smbcharger-iio.ko
-touchscreen_mmi.ko
+mmi_annotate.ko
 sensors_class.ko
+qpnp_adaptive_charge.ko
+goodix_brl_mmi.ko
+touchscreen_mmi.ko
+sm5602_fg_mmi.ko
+tcpc_class.ko
+tcpc_sgm7220.ko
+adapter_class.ko
+rt_pd_manager.ko
+cw2217b_fg_mmi.ko
+sgm4154x_charger.ko
+bq2589x_charger.ko
+bq2597x_mmi_iio.ko
+mmi_sys_temp.ko
+mmi_charger.ko
+mmi_discrete_charger_class.ko
+mmi_discrete_charger.ko
+mmi_discrete_turbo_charger.ko