I agree with your suggestion. I've also been considering revamping this theme to Bootstrap 5, and joining forces with Barrio might be the best way forward.
I've granted all permissions to Shelane :)