I updated my separate branch where I was testing the Includes and now am using Packages. I really like how it is coming together, although I still see some room for improvement in how I have it laid out, but it is working for all AG models (except the original Open Air)
MallocArray/airgradient_esphome at includes (github.com)
In this branch I also added the display page that another user created to match the Arduino code’s layout in the AG ONE model and I really like it, other than the fact it isn’t easy to read from across the room.
I also added Config switches to the config so you can enable any of the previous pages my configs had. By default it only shows the new single page, but you can enable or disable any of the pages so they are added to the rotation, including a blank page if you want to effectively disable the display.
Going to be looking at how that could be added to an automation to disable all of the other pages and enable only the Blank page overnight, but that is for the future