This project should probably get converted to PlatformIO. It would make the whole thing way easier. That would require the .ino files to be converted to .cpp anyway (on of the tasks in #1). It shouldn't be too hard, but would make the code way easier to deal with moving forward.