Try to modify as less as possible external files for HTC specific (bms/charger/leds). This will ease further patching. But this needs to use the -htc ones in board files.